@sonordev/site-kit 5.5.0 → 5.7.0

package/dist/cli/index.mjs

@@ -3,12 +3,12 @@ import { traverse, isJSXIdentifier, isJSXAttribute, isFunctionDeclaration, isVar
 import { parse } from '../chunk-5YA6SI4Z.mjs';
 import { buildOgHtml, TITLE_MAX_PX, OG_REPORT_ATTR } from '../chunk-UJ6CHZAI.mjs';
 import { require_main } from '../chunk-NNZDWY3L.mjs';
-import { findAppDirForDiscovery, discoverNextJsRoutes } from '../chunk-XIJ4F6IE.mjs';
-import { SITE_KIT_VERSION } from '../chunk-WDBCXRTT.mjs';
+import { findAppDirForDiscovery, NEXT_PROXY_FILES, NEXT_MIDDLEWARE_FILES, findConventionFile, NEXT_APP_DIRS, findSitemapRoute, findProxyFiles, findRootLayout, discoverNextJsRoutes, hasPageFile } from '../chunk-L4V6TKMJ.mjs';
+import { SITE_KIT_VERSION } from '../chunk-QRBPT6Z6.mjs';
 import { __commonJS, __require, __toESM, __export, __privateAdd, __publicField, __privateGet, __privateMethod, __privateSet, __privateWrapper } from '../chunk-BEXTDHO4.mjs';
 import { EventEmitter } from 'events';
 import childProcess, { execFile as execFile$1, execSync, spawnSync, spawn } from 'child_process';
-import path10, { win32, posix } from 'path';
+import path12, { win32, posix } from 'path';
 import * as fs from 'fs';
 import fs__default, { realpathSync, existsSync, readFileSync, readdirSync, statSync, readlinkSync, readdir as readdir$1, lstatSync, rmSync, mkdtempSync, writeFileSync } from 'fs';
 import process2 from 'process';
@@ -6202,10 +6202,10 @@ var require_lib2 = __commonJS({
     exports.analyse = analyse;
     var detectFile = (filepath, opts = {}) => new Promise((resolve, reject) => {
       let fd;
-      const fs27 = (0, node_1.default)();
+      const fs30 = (0, node_1.default)();
       const handler = (err, buffer) => {
         if (fd) {
-          fs27.closeSync(fd);
+          fs30.closeSync(fd);
         }
         if (err) {
           reject(err);
@@ -6217,9 +6217,9 @@ var require_lib2 = __commonJS({
       };
       const sampleSize = (opts === null || opts === void 0 ? void 0 : opts.sampleSize) || 0;
       if (sampleSize > 0) {
-        fd = fs27.openSync(filepath, "r");
+        fd = fs30.openSync(filepath, "r");
         let sample = Buffer.allocUnsafe(sampleSize);
-        fs27.read(fd, sample, 0, sampleSize, opts.offset, (err, bytesRead) => {
+        fs30.read(fd, sample, 0, sampleSize, opts.offset, (err, bytesRead) => {
           if (err) {
             handler(err, null);
           } else {
@@ -6231,22 +6231,22 @@ var require_lib2 = __commonJS({
         });
         return;
       }
-      fs27.readFile(filepath, handler);
+      fs30.readFile(filepath, handler);
     });
     exports.detectFile = detectFile;
     var detectFileSync = (filepath, opts = {}) => {
-      const fs27 = (0, node_1.default)();
+      const fs30 = (0, node_1.default)();
       if (opts && opts.sampleSize) {
-        const fd = fs27.openSync(filepath, "r");
+        const fd = fs30.openSync(filepath, "r");
         let sample = Buffer.allocUnsafe(opts.sampleSize);
-        const bytesRead = fs27.readSync(fd, sample, 0, opts.sampleSize, opts.offset);
+        const bytesRead = fs30.readSync(fd, sample, 0, opts.sampleSize, opts.offset);
         if (bytesRead < opts.sampleSize) {
           sample = sample.subarray(0, bytesRead);
         }
-        fs27.closeSync(fd);
+        fs30.closeSync(fd);
         return (0, exports.detect)(sample);
       }
-      return (0, exports.detect)(fs27.readFileSync(filepath));
+      return (0, exports.detect)(fs30.readFileSync(filepath));
     };
     exports.detectFileSync = detectFileSync;
     exports.default = {
@@ -10135,7 +10135,7 @@ var require_run_async = __commonJS({
 });
 
 // src/cli/index.ts
-var import_dotenv = __toESM(require_main());
+var import_dotenv2 = __toESM(require_main());
 
 // node_modules/.pnpm/commander@15.0.0/node_modules/commander/lib/error.js
 var CommanderError = class extends Error {
@@ -12264,9 +12264,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
     args = args.slice();
     const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
     function findFile(baseDir, baseName) {
-      const localBin = path10.resolve(baseDir, baseName);
+      const localBin = path12.resolve(baseDir, baseName);
       if (fs__default.existsSync(localBin)) return localBin;
-      if (sourceExt.includes(path10.extname(baseName))) return void 0;
+      if (sourceExt.includes(path12.extname(baseName))) return void 0;
       const foundExt = sourceExt.find(
         (ext2) => fs__default.existsSync(`${localBin}${ext2}`)
       );
@@ -12284,17 +12284,17 @@ Expecting one of '${allowedValues.join("', '")}'`);
       } catch {
         resolvedScriptPath = this._scriptPath;
       }
-      executableDir = path10.resolve(
-        path10.dirname(resolvedScriptPath),
+      executableDir = path12.resolve(
+        path12.dirname(resolvedScriptPath),
         executableDir
       );
     }
     if (executableDir) {
       let localFile = findFile(executableDir, executableFile);
       if (!localFile && !subcommand._executableFile && this._scriptPath) {
-        const legacyName = path10.basename(
+        const legacyName = path12.basename(
           this._scriptPath,
-          path10.extname(this._scriptPath)
+          path12.extname(this._scriptPath)
         );
         if (legacyName !== this._name) {
           localFile = findFile(
@@ -12305,7 +12305,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
       }
       executableFile = localFile || executableFile;
     }
-    const launchWithNode = sourceExt.includes(path10.extname(executableFile));
+    const launchWithNode = sourceExt.includes(path12.extname(executableFile));
     let proc;
     if (process2.platform !== "win32") {
       if (launchWithNode) {
@@ -13222,7 +13222,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
    * @return {Command}
    */
   nameFromFilename(filename) {
-    this._name = path10.basename(filename, path10.extname(filename));
+    this._name = path12.basename(filename, path12.extname(filename));
     return this;
   }
   /**
@@ -13236,9 +13236,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
    * @param {string} [path]
    * @return {(string|null|Command)}
    */
-  executableDir(path27) {
-    if (path27 === void 0) return this._executableDir;
-    this._executableDir = path27;
+  executableDir(path30) {
+    if (path30 === void 0) return this._executableDir;
+    this._executableDir = path30;
     return this;
   }
   /**
@@ -18747,7 +18747,7 @@ function createPrompt(view) {
             if (nextView === void 0) {
               let callerFilename = callSites[1]?.getFileName();
               if (callerFilename && !callerFilename.startsWith("file://")) {
-                callerFilename = path10.resolve(callerFilename);
+                callerFilename = path12.resolve(callerFilename);
               }
               throw new Error(`Prompt functions must return a string.
     at ${callerFilename}`);
@@ -19136,13 +19136,13 @@ var ExternalEditor = class {
   }
   createTempFile() {
     try {
-      const baseDir = path10.resolve(this.fileOptions.dir ?? os.tmpdir());
-      this.tempDir = mkdtempSync(path10.join(baseDir, "inquirer-editor-"));
+      const baseDir = path12.resolve(this.fileOptions.dir ?? os.tmpdir());
+      this.tempDir = mkdtempSync(path12.join(baseDir, "inquirer-editor-"));
       const id = randomUUID();
       const prefix = sanitizeAffix(this.fileOptions.prefix);
       const postfix = sanitizeAffix(this.fileOptions.postfix);
       const filename = `${prefix}${id}${postfix}`;
-      this.tempFile = path10.join(this.tempDir, filename);
+      this.tempFile = path12.join(this.tempDir, filename);
       const opt = { encoding: "utf8", flag: "wx" };
       if (Object.prototype.hasOwnProperty.call(this.fileOptions, "mode")) {
         opt.mode = this.fileOptions.mode;
@@ -20345,9 +20345,9 @@ function observableToAsyncIterable(source) {
 
 // node_modules/.pnpm/inquirer@14.0.2_@types+node@26.2.0/node_modules/inquirer/dist/ui/prompt.js
 var _ = {
-  set: (obj, path27 = "", value) => {
+  set: (obj, path30 = "", value) => {
     let pointer = obj;
-    path27.split(".").forEach((key, index, arr) => {
+    path30.split(".").forEach((key, index, arr) => {
       if (key === "__proto__" || key === "constructor")
         return;
       if (index === arr.length - 1) {
@@ -20358,8 +20358,8 @@ var _ = {
       pointer = pointer[key];
     });
   },
-  get: (obj, path27 = "", defaultValue) => {
-    const travel = (regexp) => String.prototype.split.call(path27, regexp).filter(Boolean).reduce(
+  get: (obj, path30 = "", defaultValue) => {
+    const travel = (regexp) => String.prototype.split.call(path30, regexp).filter(Boolean).reduce(
       // @ts-expect-error implicit any on res[key]
       (res, key) => res == null ? res : res[key],
       obj
@@ -20649,7 +20649,7 @@ async function scanCodebase(rootDir) {
   for (const file of files) {
     try {
       const content = await fs3.readFile(file, "utf-8");
-      const relPath = path10.relative(rootDir, file);
+      const relPath = path12.relative(rootDir, file);
       const ast = parse(content, {
         sourceType: "module",
         plugins: ["jsx", "typescript"]
@@ -20698,7 +20698,7 @@ async function scanCodebase(rootDir) {
 async function findSourceFiles(dir, files = []) {
   const entries = await fs3.readdir(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = path10.join(dir, entry.name);
+    const fullPath = path12.join(dir, entry.name);
     if (entry.isDirectory()) {
       if (["node_modules", ".next", ".git", "dist", "build"].includes(entry.name)) {
         continue;
@@ -20716,18 +20716,18 @@ function scanForForms(ast, content, filePath) {
   const forms = [];
   content.split("\n");
   traverse(ast, {
-    JSXElement(path27) {
-      const opening = path27.node.openingElement;
+    JSXElement(path30) {
+      const opening = path30.node.openingElement;
       if (isJSXIdentifier(opening.name) && opening.name.name === "form") {
-        const fields = extractFieldsFromForm(path27);
+        const fields = extractFieldsFromForm(path30);
         const hasOnSubmit = opening.attributes.some(
           (attr) => isJSXAttribute(attr) && isJSXIdentifier(attr.name) && attr.name.name === "onSubmit"
         );
         if (hasOnSubmit && fields.length > 0) {
-          const startLine = path27.node.loc?.start.line || 0;
-          const endLine = path27.node.loc?.end.line || 0;
+          const startLine = path30.node.loc?.start.line || 0;
+          const endLine = path30.node.loc?.end.line || 0;
           let componentName = "UnknownForm";
-          let current = path27.parentPath;
+          let current = path30.parentPath;
           while (current) {
             if (isFunctionDeclaration(current.node) && current.node.id) {
               componentName = current.node.id.name;
@@ -20760,7 +20760,7 @@ function scanForForms(ast, content, filePath) {
       }
       if (isJSXIdentifier(opening.name) && opening.name.name === "Form") {
         if (content.includes("Formik") || content.includes("formik")) {
-          const fields = extractFieldsFromFormik(path27);
+          const fields = extractFieldsFromFormik(path30);
           if (fields.length > 0) {
             forms.push({
               filePath,
@@ -20771,8 +20771,8 @@ function scanForForms(ast, content, filePath) {
               submitsTo: null,
               complexity: "moderate",
               suggestedAction: "assisted",
-              startLine: path27.node.loc?.start.line || 0,
-              endLine: path27.node.loc?.end.line || 0
+              startLine: path30.node.loc?.start.line || 0,
+              endLine: path30.node.loc?.end.line || 0
             });
           }
         }
@@ -20790,8 +20790,8 @@ function extractFieldsFromForm(formPath) {
   const radioGroups = /* @__PURE__ */ new Map();
   const checkboxGroups = /* @__PURE__ */ new Map();
   formPath.traverse({
-    JSXElement(path27) {
-      const opening = path27.node.openingElement;
+    JSXElement(path30) {
+      const opening = path30.node.openingElement;
       const tagName = isJSXIdentifier(opening.name) ? opening.name.name : null;
       if (["input", "textarea", "select"].includes(tagName || "")) {
         const attrs = opening.attributes;
@@ -20838,7 +20838,7 @@ function extractFieldsFromForm(formPath) {
         }
         if (tagName === "select") {
           const selectOptions = [];
-          path27.traverse({
+          path30.traverse({
             JSXElement(optionPath) {
               const optOpening = optionPath.node.openingElement;
               const optTagName = isJSXIdentifier(optOpening.name) ? optOpening.name.name : null;
@@ -20913,8 +20913,8 @@ function extractFieldsFromForm(formPath) {
 function extractFieldsFromFormik(formPath, content) {
   const fields = [];
   formPath.traverse({
-    JSXElement(path27) {
-      const opening = path27.node.openingElement;
+    JSXElement(path30) {
+      const opening = path30.node.openingElement;
       const tagName = isJSXIdentifier(opening.name) ? opening.name.name : null;
       if (tagName === "Field" || tagName === "FastField") {
         const attrs = opening.attributes;
@@ -21033,11 +21033,11 @@ function scanForMetadata(ast, content, filePath) {
   }
   let hasHeadComponent = false;
   traverse(ast, {
-    JSXElement(path27) {
-      const opening = path27.node.openingElement;
+    JSXElement(path30) {
+      const opening = path30.node.openingElement;
       if (isJSXIdentifier(opening.name) && opening.name.name === "Head") {
         hasHeadComponent = true;
-        path27.stop();
+        path30.stop();
       }
     }
   });
@@ -21072,8 +21072,8 @@ function scanForWidgets(ast, content, filePath) {
   for (const { pattern, type } of widgetPatterns) {
     if (pattern.test(content)) {
       traverse(ast, {
-        JSXElement(path27) {
-          const opening = path27.node.openingElement;
+        JSXElement(path30) {
+          const opening = path30.node.openingElement;
           if (isJSXIdentifier(opening.name) && (opening.name.name === "script" || opening.name.name === "Script")) {
             const srcAttr = opening.attributes.find(
               (attr) => isJSXAttribute(attr) && isJSXIdentifier(attr.name) && attr.name.name === "src"
@@ -21088,8 +21088,8 @@ function scanForWidgets(ast, content, filePath) {
                   filePath,
                   widgetType: type,
                   scriptTag: src,
-                  startLine: path27.node.loc?.start.line || 0,
-                  endLine: path27.node.loc?.end.line || 0
+                  startLine: path30.node.loc?.start.line || 0,
+                  endLine: path30.node.loc?.end.line || 0
                 });
               }
             }
@@ -21163,7 +21163,7 @@ async function scanForSitemapFiles(rootDir) {
     "next-sitemap.config.ts"
   ];
   for (const configPath of configPaths) {
-    const fullPath = path10.join(rootDir, configPath);
+    const fullPath = path12.join(rootDir, configPath);
     try {
       await fs3.access(fullPath);
       const content = await fs3.readFile(fullPath, "utf-8");
@@ -21181,7 +21181,7 @@ async function scanForSitemapFiles(rootDir) {
     } catch {
     }
   }
-  const staticSitemapPath = path10.join(rootDir, "public", "sitemap.xml");
+  const staticSitemapPath = path12.join(rootDir, "public", "sitemap.xml");
   try {
     await fs3.access(staticSitemapPath);
     const content = await fs3.readFile(staticSitemapPath, "utf-8");
@@ -21204,7 +21204,7 @@ async function scanForSitemapFiles(rootDir) {
     "out/sitemap.xml"
   ];
   for (const genPath of generatedPaths) {
-    const fullPath = path10.join(rootDir, genPath);
+    const fullPath = path12.join(rootDir, genPath);
     try {
       await fs3.access(fullPath);
     } catch {
@@ -21228,8 +21228,8 @@ function scanForSchemas(ast, content, filePath) {
     return schemas;
   }
   traverse(ast, {
-    JSXElement(path27) {
-      const opening = path27.node.openingElement;
+    JSXElement(path30) {
+      const opening = path30.node.openingElement;
       if (isJSXIdentifier(opening.name) && (opening.name.name === "script" || opening.name.name === "Script")) {
         const typeAttr = opening.attributes.find(
           (attr) => isJSXAttribute(attr) && isJSXIdentifier(attr.name) && attr.name.name === "type"
@@ -21256,8 +21256,8 @@ function scanForSchemas(ast, content, filePath) {
               filePath,
               type: detectedType,
               schemaType,
-              startLine: path27.node.loc?.start.line || 0,
-              endLine: path27.node.loc?.end.line || 0
+              startLine: path30.node.loc?.start.line || 0,
+              endLine: path30.node.loc?.end.line || 0
             });
           }
         }
@@ -21290,8 +21290,8 @@ function scanForFAQs(ast, content, filePath) {
     /questions?\s*(?:and|&)?\s*answers?/i
   ];
   traverse(ast, {
-    JSXElement(path27) {
-      const opening = path27.node.openingElement;
+    JSXElement(path30) {
+      const opening = path30.node.openingElement;
       let tagName = "";
       if (isJSXIdentifier(opening.name)) {
         tagName = opening.name.name;
@@ -21304,8 +21304,8 @@ function scanForFAQs(ast, content, filePath) {
         faqs.push({
           filePath,
           type: "details-summary",
-          startLine: path27.node.loc?.start.line || 0,
-          endLine: path27.node.loc?.end.line || 0,
+          startLine: path30.node.loc?.start.line || 0,
+          endLine: path30.node.loc?.end.line || 0,
           hasSchema: content.includes("FAQPage") || content.includes("application/ld+json")
         });
         return;
@@ -21313,7 +21313,7 @@ function scanForFAQs(ast, content, filePath) {
       for (const pattern of faqPatterns) {
         if (pattern.test(tagName)) {
           let itemCount = 0;
-          path27.traverse({
+          path30.traverse({
             JSXElement(itemPath) {
               const itemOpening = itemPath.node.openingElement;
               if (isJSXIdentifier(itemOpening.name)) {
@@ -21329,8 +21329,8 @@ function scanForFAQs(ast, content, filePath) {
             type: "accordion",
             componentName: tagName,
             itemCount: itemCount || void 0,
-            startLine: path27.node.loc?.start.line || 0,
-            endLine: path27.node.loc?.end.line || 0,
+            startLine: path30.node.loc?.start.line || 0,
+            endLine: path30.node.loc?.end.line || 0,
             hasSchema: content.includes("FAQPage") || content.includes("application/ld+json")
           });
           return;
@@ -21453,8 +21453,8 @@ function scanForImages(ast, content, filePath) {
     return images;
   }
   traverse(ast, {
-    JSXElement(path27) {
-      const opening = path27.node.openingElement;
+    JSXElement(path30) {
+      const opening = path30.node.openingElement;
       if (!isJSXIdentifier(opening.name)) return;
       const tagName = opening.name.name;
       if (tagName === "img" || tagName === "Image") {
@@ -21482,8 +21482,8 @@ function scanForImages(ast, content, filePath) {
           src: src || void 0,
           alt: alt || void 0,
           isLocal,
-          startLine: path27.node.loc?.start.line || 0,
-          endLine: path27.node.loc?.end.line || 0
+          startLine: path30.node.loc?.start.line || 0,
+          endLine: path30.node.loc?.end.line || 0
         });
       }
     }
@@ -21688,7 +21688,7 @@ async function migrateFiles(scanResults, options) {
 }
 async function migrateForm(form, options) {
   const changes = [];
-  const fullPath = path10.resolve(process.cwd(), form.filePath);
+  const fullPath = path12.resolve(process.cwd(), form.filePath);
   const formSlug = generateSlug(form.componentName);
   let formId;
   if (!options.dryRun) {
@@ -21827,7 +21827,7 @@ export default ${componentName}
 `;
 }
 async function createFormInUptrade(form, slug, options) {
-  const response = await fetch("https://api.sonor.io/forms", {
+  const response = await fetch(`${options.apiUrl || "https://api.sonor.io"}/forms`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -21865,7 +21865,7 @@ async function migrateWidget(filePath, widget, options) {
     changes.push("[DRY RUN] Sonor Engage chat would come from SiteKitLayout (engage is on by default)");
     return { filePath, success: true, changes };
   }
-  const fullPath = path10.resolve(process.cwd(), filePath);
+  const fullPath = path12.resolve(process.cwd(), filePath);
   let content = await fs3.readFile(fullPath, "utf-8");
   switch (widget.widgetType) {
     case "intercom":
@@ -21902,15 +21902,15 @@ function matchBalancedBraces(content, startIndex) {
 }
 async function migrateMetadata(filePath, metadata, options) {
   const changes = [];
-  const fullPath = path10.resolve(process.cwd(), filePath);
+  const fullPath = path12.resolve(process.cwd(), filePath);
   let pagePath = filePath.replace(/^app\//, "/").replace(/^src\/app\//, "/").replace(/\/page\.(tsx?|jsx?)$/, "").replace(/\/layout\.(tsx?|jsx?)$/, "").replace(/\[([^\]]+)\]/g, ":$1");
   if (pagePath === "") pagePath = "/";
   let content = await fs3.readFile(fullPath, "utf-8");
   const isTypeScript = filePath.endsWith(".tsx") || filePath.endsWith(".ts");
   const ext2 = isTypeScript ? ".tsx" : ".jsx";
   if (isClientComponent(content)) {
-    const dir = path10.dirname(fullPath);
-    const layoutPath = path10.join(dir, `layout${ext2}`);
+    const dir = path12.dirname(fullPath);
+    const layoutPath = path12.join(dir, `layout${ext2}`);
     try {
       await fs3.access(layoutPath);
       const layoutContent = await fs3.readFile(layoutPath, "utf-8");
@@ -21933,7 +21933,7 @@ async function migrateMetadata(filePath, metadata, options) {
     } catch (error2) {
       changes.push(`Page metadata may already exist: ${pagePath}`);
     }
-    const dirName = path10.basename(dir).replace(/^\[\.\.\.([^\]]+)\]$/, "$1").replace(/^\[([^\]]+)\]$/, "$1");
+    const dirName = path12.basename(dir).replace(/^\[\.\.\.([^\]]+)\]$/, "$1").replace(/^\[([^\]]+)\]$/, "$1");
     const layoutName = dirName.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join("") + "Layout";
     const layoutCode = `import { getManagedMetadata, ManagedSchema } from '@sonordev/site-kit/seo'
 
@@ -22042,7 +22042,7 @@ export async function generateMetadata() {
   return { filePath, success: true, changes };
 }
 async function createPageMetadata(pagePath, metadata, options) {
-  const response = await fetch("https://api.sonor.io/seo/pages", {
+  const response = await fetch(`${options.apiUrl || "https://api.sonor.io"}/seo/pages`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -22127,7 +22127,7 @@ async function createSchemaRecord(pagePath, schemaType, schemaJson, options) {
 }
 async function migrateSchema(filePath, schema, options) {
   const changes = [];
-  const fullPath = path10.resolve(process.cwd(), filePath);
+  const fullPath = path12.resolve(process.cwd(), filePath);
   let pagePath = filePath.replace(/^app\//, "/").replace(/^src\/app\//, "/").replace(/\/page\.(tsx?|jsx?)$/, "").replace(/\[([^\]]+)\]/g, ":$1");
   if (pagePath === "") pagePath = "/";
   let content = await fs3.readFile(fullPath, "utf-8");
@@ -22238,7 +22238,7 @@ async function createFAQRecord(pagePath, items, options) {
 }
 async function migrateFAQ(filePath, faq, options) {
   const changes = [];
-  const fullPath = path10.resolve(process.cwd(), filePath);
+  const fullPath = path12.resolve(process.cwd(), filePath);
   let pagePath = filePath.replace(/^app\//, "/").replace(/^src\/app\//, "/").replace(/\/page\.(tsx?|jsx?)$/, "").replace(/\[([^\]]+)\]/g, ":$1");
   if (pagePath === "") pagePath = "/";
   let content = await fs3.readFile(fullPath, "utf-8");
@@ -22306,7 +22306,7 @@ async function migrateFAQ(filePath, faq, options) {
 }
 async function migrateSitemap(filePath, sitemap, options) {
   const changes = [];
-  const fullPath = path10.resolve(process.cwd(), filePath);
+  const fullPath = path12.resolve(process.cwd(), filePath);
   if (options.dryRun) {
     changes.push(`[DRY RUN] Would migrate ${sitemap.type} to Site-Kit sitemap`);
     if (sitemap.type === "next-sitemap-config") {
@@ -22348,8 +22348,8 @@ async function migrateAnalytics(filePath, analytics, options) {
   return { filePath, success: true, changes };
 }
 async function migrateFile(filePath, options) {
-  const fullPath = path10.resolve(filePath);
-  const relPath = path10.relative(process.cwd(), fullPath);
+  const fullPath = path12.resolve(filePath);
+  const relPath = path12.relative(process.cwd(), fullPath);
   const content = await fs3.readFile(fullPath, "utf-8");
   const hasFormTag = content.includes("<form") || content.includes("onSubmit");
   const hasWidget = /intercom|crisp|drift|hubspot|zendesk/i.test(content);
@@ -22366,26 +22366,26 @@ async function migrateFile(filePath, options) {
     return migrateWidget(relPath, {
       widgetType}, options);
   }
-  const { parse: parse2 } = await import('../lib-R7IQ4ZHE.mjs');
-  const ast = parse2(content, {
+  const { parse: parse3 } = await import('../lib-R7IQ4ZHE.mjs');
+  const ast = parse3(content, {
     sourceType: "module",
     plugins: ["jsx", "typescript"]
   });
   let componentName = "Form";
   const traverse2 = (await import('../lib-RSDMEKDQ.mjs')).default;
   traverse2(ast, {
-    ExportNamedDeclaration(path27) {
-      const decl = path27.node.declaration;
+    ExportNamedDeclaration(path30) {
+      const decl = path30.node.declaration;
       if (decl && decl.type === "FunctionDeclaration" && decl.id) {
         componentName = decl.id.name;
-        path27.stop();
+        path30.stop();
       }
     },
-    ExportDefaultDeclaration(path27) {
-      const decl = path27.node.declaration;
+    ExportDefaultDeclaration(path30) {
+      const decl = path30.node.declaration;
       if (decl && decl.type === "FunctionDeclaration" && decl.id) {
         componentName = decl.id.name;
-        path27.stop();
+        path30.stop();
       }
     }
   });
@@ -22442,7 +22442,7 @@ function detectFormType(form) {
   return "contact";
 }
 async function generateEnvFile(options) {
-  const envPath = path10.join(process.cwd(), ".env.local");
+  const envPath = path12.join(process.cwd(), ".env.local");
   let existingContent = "";
   try {
     existingContent = await fs3.readFile(envPath, "utf-8");
@@ -22501,7 +22501,7 @@ function addImportSafely2(content, importStatement) {
 async function generateLayout() {
   const layoutPath = await findLayoutFile();
   if (!layoutPath) {
-    throw new Error("Could not find layout.tsx file");
+    throw new Error("Could not find a root layout (app/layout.tsx, .jsx, .ts or .js)");
   }
   const content = await fs3.readFile(layoutPath, "utf-8");
   if (content.includes("SiteKitLayout") || content.includes("SiteKitProvider")) {
@@ -22535,22 +22535,7 @@ async function generateLayout() {
   await fs3.writeFile(layoutPath, newContent, "utf-8");
 }
 async function findLayoutFile() {
-  const possiblePaths = [
-    "src/app/layout.tsx",
-    "app/layout.tsx",
-    "src/app/layout.jsx",
-    "app/layout.jsx"
-  ];
-  for (const relativePath of possiblePaths) {
-    const fullPath = path10.join(process.cwd(), relativePath);
-    try {
-      await fs3.access(fullPath);
-      return fullPath;
-    } catch {
-      continue;
-    }
-  }
-  return null;
+  return findRootLayout(process.cwd());
 }
 var isDockerCached;
 function hasDockerEnv() {
@@ -22712,15 +22697,15 @@ var wslDefaultBrowser = async () => {
   const { stdout } = await executePowerShell(command, { powerShellPath: psPath });
   return stdout.trim();
 };
-var convertWslPathToWindows = async (path27) => {
-  if (/^[a-z]+:\/\//i.test(path27)) {
-    return path27;
+var convertWslPathToWindows = async (path30) => {
+  if (/^[a-z]+:\/\//i.test(path30)) {
+    return path30;
   }
   try {
-    const { stdout } = await execFile2("wslpath", ["-aw", path27], { encoding: "utf8" });
+    const { stdout } = await execFile2("wslpath", ["-aw", path30], { encoding: "utf8" });
     return stdout.trim();
   } catch {
-    return path27;
+    return path30;
   }
 };
 
@@ -22840,8 +22825,8 @@ var is_in_ssh_default = isInSsh;
 
 // node_modules/.pnpm/open@11.0.0/node_modules/open/index.js
 var fallbackAttemptSymbol = /* @__PURE__ */ Symbol("fallbackAttempt");
-var __dirname2 = import.meta.url ? path10.dirname(fileURLToPath(import.meta.url)) : "";
-var localXdgOpenPath = path10.join(__dirname2, "xdg-open");
+var __dirname2 = import.meta.url ? path12.dirname(fileURLToPath(import.meta.url)) : "";
+var localXdgOpenPath = path12.join(__dirname2, "xdg-open");
 var { platform, arch } = process2;
 var tryEachApp = async (apps2, opener) => {
   if (apps2.length === 0) {
@@ -23119,8 +23104,37 @@ defineLazyProperty(apps, "safari", () => detectPlatformBinary({
   darwin: "Safari"
 }));
 var open_default = open;
+var SONOR_STATE_DIR = ".sonor";
+var IMAGE_MANIFEST = ".sonor-images.json";
+var LEGACY_IMAGE_MANIFEST = ".uptrade-images.json";
+var LEGACY_STATE_DIR = ".uptrade";
+function resolveStateReadPath(relativePath, root = process.cwd()) {
+  return preferCurrent(path12.join(root, SONOR_STATE_DIR, relativePath), path12.join(root, LEGACY_STATE_DIR, relativePath));
+}
+function resolveImageManifestReadPath(root) {
+  return preferCurrent(path12.join(root, IMAGE_MANIFEST), path12.join(root, LEGACY_IMAGE_MANIFEST));
+}
+function preferCurrent(current, legacy) {
+  return existsSync(current) || !existsSync(legacy) ? current : legacy;
+}
+async function listLocalTemplates(root = process.cwd()) {
+  const names = /* @__PURE__ */ new Set();
+  for (const dir of [SONOR_STATE_DIR, LEGACY_STATE_DIR]) {
+    try {
+      const files = await fs3.readdir(path12.join(root, dir, "templates"));
+      for (const file of files) if (file.endsWith(".json")) names.add(file);
+    } catch (error2) {
+      if (error2.code !== "ENOENT") throw error2;
+    }
+  }
+  return [...names].sort();
+}
+
+// src/cli/api/sonor.ts
 var PORTAL_URL = "https://app.sonor.io";
-var API_URL = process.env.SONOR_API_URL || "https://api.sonor.io";
+function getSonorApiUrl() {
+  return (process.env.SONOR_API_URL || "https://api.sonor.io").replace(/\/+$/, "");
+}
 async function authenticateWithSonor() {
   return new Promise((resolve, reject) => {
     const server = http.createServer(async (req, res) => {
@@ -23147,7 +23161,7 @@ async function authenticateWithSonor() {
           server.close();
           return;
         }
-        const tokenResponse = await fetch(`${API_URL}/auth/cli-token`, {
+        const tokenResponse = await fetch(`${getSonorApiUrl()}/auth/cli-token`, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify({ code, redirect_uri: `http://localhost:${port}/callback` })
@@ -23193,32 +23207,41 @@ async function authenticateWithSonor() {
     }, 5 * 60 * 1e3);
   });
 }
-async function authenticateWithApiKey(apiKey) {
-  const response = await fetch(`${API_URL}/api/public/seo/verify-api-key`, {
-    headers: { "X-API-Key": apiKey }
-  });
-  if (response.ok) {
-    const data = await response.json();
-    if (data.valid) {
-      return {
-        accessToken: apiKey,
-        userId: "api-key-user",
-        email: data.project?.name ? `Project: ${data.project.name}` : `API Key verified`,
-        projectId: data.project?.id,
-        projectName: data.project?.name,
-        orgId: data.organization?.id,
-        orgName: data.organization?.name,
-        isApiKey: true
-      };
-    }
+async function authenticateWithApiKey(apiKey, apiUrl = getSonorApiUrl()) {
+  let response;
+  try {
+    response = await fetch(`${apiUrl}/api/public/seo/verify-api-key`, {
+      headers: { "X-API-Key": apiKey },
+      signal: AbortSignal.timeout(15e3)
+    });
+  } catch {
+    throw new NetworkError("PROJECT_LOOKUP_FAILED", "Could not reach the Sonor API to resolve the project. Check SONOR_API_URL and your connection.");
   }
-  if (response.status === 401) {
-    throw new Error("Invalid API key");
+  if (!response.ok) {
+    throw new NetworkError("PROJECT_LOOKUP_FAILED", `Sonor API verification failed (HTTP ${response.status}). Check SONOR_API_KEY and SONOR_API_URL.`);
   }
-  throw new Error(`API verification failed: ${response.status}`);
+  let data;
+  try {
+    data = await response.json();
+  } catch {
+    throw new NetworkError("INVALID_PROJECT_RESPONSE", "Sonor API returned an invalid project response.");
+  }
+  if (data?.valid !== true || typeof data.project?.id !== "string" || !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(data.project.id)) {
+    throw new NetworkError("INVALID_PROJECT_RESPONSE", "Sonor API did not return a valid full project UUID. Check SONOR_API_KEY.");
+  }
+  return {
+    accessToken: apiKey,
+    userId: "api-key-user",
+    email: data.project.name ? `Project: ${data.project.name}` : "API Key verified",
+    projectId: data.project.id,
+    projectName: data.project.name,
+    orgId: data.organization?.id,
+    orgName: data.organization?.name,
+    isApiKey: true
+  };
 }
 async function fetchOrganizations(accessToken) {
-  const response = await fetch(`${API_URL}/organizations`, {
+  const response = await fetch(`${getSonorApiUrl()}/organizations`, {
     headers: { "Authorization": `Bearer ${accessToken}` }
   });
   if (!response.ok) {
@@ -23227,7 +23250,7 @@ async function fetchOrganizations(accessToken) {
   return response.json();
 }
 async function fetchProjects(accessToken, orgId) {
-  const response = await fetch(`${API_URL}/organizations/${orgId}/projects`, {
+  const response = await fetch(`${getSonorApiUrl()}/organizations/${orgId}/projects`, {
     headers: { "Authorization": `Bearer ${accessToken}` }
   });
   if (!response.ok) {
@@ -23236,7 +23259,7 @@ async function fetchProjects(accessToken, orgId) {
   return response.json();
 }
 async function createProject(accessToken, orgId, data) {
-  const response = await fetch(`${API_URL}/organizations/${orgId}/projects`, {
+  const response = await fetch(`${getSonorApiUrl()}/organizations/${orgId}/projects`, {
     method: "POST",
     headers: {
       "Authorization": `Bearer ${accessToken}`,
@@ -23250,7 +23273,7 @@ async function createProject(accessToken, orgId, data) {
   return response.json();
 }
 async function generateApiKey(accessToken, projectId) {
-  const response = await fetch(`${API_URL}/projects/${projectId}/api-keys`, {
+  const response = await fetch(`${getSonorApiUrl()}/projects/${projectId}/api-keys`, {
     method: "POST",
     headers: {
       "Authorization": `Bearer ${accessToken}`,
@@ -23454,7 +23477,7 @@ function progress(ctx, line) {
 // src/cli/commands/init.ts
 async function checkNextJsProject(cwd) {
   try {
-    const pkg = JSON.parse(await fs3.readFile(path10.join(cwd, "package.json"), "utf-8"));
+    const pkg = JSON.parse(await fs3.readFile(path12.join(cwd, "package.json"), "utf-8"));
     return !!(pkg.dependencies?.next || pkg.devDependencies?.next);
   } catch {
     return false;
@@ -23534,7 +23557,7 @@ async function run(ctx, options) {
     ]);
     if (chosen === "new") {
       const answers = await dist_default14.prompt([
-        { type: "input", name: "name", message: "Project name:", default: path10.basename(ctx.cwd) },
+        { type: "input", name: "name", message: "Project name:", default: path12.basename(ctx.cwd) },
         { type: "input", name: "domain", message: "Project domain (optional):" }
       ]);
       const project = await createProject(auth.accessToken, orgId, { name: answers.name, domain: answers.domain || "" });
@@ -23589,7 +23612,7 @@ async function run(ctx, options) {
   };
 }
 async function ensureSitemapPostbuild(ctx) {
-  const pkgPath = path10.join(ctx.cwd, "package.json");
+  const pkgPath = path12.join(ctx.cwd, "package.json");
   try {
     const pkg = JSON.parse(await fs3.readFile(pkgPath, "utf-8"));
     if (!pkg.scripts) pkg.scripts = {};
@@ -23631,7 +23654,7 @@ async function scanCommand(options) {
   console.log("");
   console.log(source_default.bold("  Scanning codebase..."));
   console.log("");
-  const targetDir = path10.resolve(options.dir || ".");
+  const targetDir = path12.resolve(options.dir || ".");
   const spinner = ora("Looking for forms, metadata, widgets, schemas, FAQs, analytics, and images...").start();
   let scanResults;
   try {
@@ -23809,6 +23832,48 @@ async function scanCommand(options) {
     process.exit(1);
   }
 }
+
+// src/cli/config.ts
+var import_dotenv = __toESM(require_main());
+async function loadConfig({ resolveProject = false, cwd = process.cwd() } = {}) {
+  const envFile = await readOptionalFile(path12.join(cwd, ".env.local"));
+  const env3 = { ...(0, import_dotenv.parse)(envFile || ""), ...process.env };
+  const configPath = resolveStateReadPath("config.json", cwd);
+  const saved = await readOptionalFile(configPath);
+  let stored = {};
+  if (saved !== void 0) {
+    try {
+      stored = JSON.parse(saved);
+      if (!stored || typeof stored !== "object" || Array.isArray(stored)) throw new Error();
+    } catch {
+      throw new ConfigError("INVALID_CONFIG", `Invalid JSON config: ${configPath}. Fix or remove it, then set SONOR_API_KEY in .env.local.`);
+    }
+  }
+  const apiKey = String(env3.SONOR_API_KEY || stored.apiKey || stored.api_key || "").trim();
+  if (!apiKey) {
+    throw new ConfigError("MISSING_API_KEY", "Set SONOR_API_KEY in .env.local or run `sonor-setup init` first.");
+  }
+  if (!/^sonor_[0-9a-f]{8}_.+$/i.test(apiKey)) {
+    throw new ConfigError("INVALID_API_KEY", "SONOR_API_KEY must be a sonor_ key from app.sonor.io.");
+  }
+  const config2 = {
+    apiKey,
+    apiUrl: (env3.SONOR_API_URL || getSonorApiUrl()).replace(/\/+$/, ""),
+    siteUrl: env3.NEXT_PUBLIC_SITE_URL || env3.SITE_URL || stored.siteUrl || stored.site_url,
+    businessInfo: stored.businessInfo || stored.business_info
+  };
+  if (!resolveProject) return config2;
+  const auth = await authenticateWithApiKey(apiKey, config2.apiUrl);
+  return { ...config2, projectId: auth.projectId };
+}
+async function readOptionalFile(file) {
+  try {
+    return await fs3.readFile(file, "utf-8");
+  } catch (error2) {
+    if (error2.code === "ENOENT") return void 0;
+    throw new ConfigError("CONFIG_READ_FAILED", `Could not read ${file}. Check file permissions.`);
+  }
+}
 var IMAGE_EXTENSIONS = [".jpg", ".jpeg", ".png", ".gif", ".webp", ".svg", ".ico", ".bmp", ".avif"];
 var MIME_TYPES = {
   ".jpg": "image/jpeg",
@@ -23831,7 +23896,7 @@ function filePathToPagePath(filePath) {
   }
   if (p.startsWith("pages/") || p.startsWith("src/pages/")) {
     p = p.replace(/^pages\//, "").replace(/^src\/pages\//, "");
-    const base = path10.basename(p, path10.extname(p));
+    const base = path12.basename(p, path12.extname(p));
     return base === "index" ? "/" : "/" + base;
   }
   p = p.replace(/\.[^.]+$/, "").replace(/^\.\//, "").replace(/\\/g, "/");
@@ -23874,8 +23939,8 @@ async function imagesCommand(subcommand, options) {
   }
 }
 async function scanImages(options) {
-  const targetDir = path10.resolve(options.dir || ".");
-  const publicDir = path10.join(targetDir, "public");
+  const targetDir = path12.resolve(options.dir || ".");
+  const publicDir = path12.join(targetDir, "public");
   try {
     await fs3.access(publicDir);
   } catch {
@@ -23945,7 +24010,7 @@ async function uploadImages(options) {
     console.log("");
     process.exit(1);
   }
-  const targetDir = path10.resolve(options.dir || ".");
+  const targetDir = path12.resolve(options.dir || ".");
   const spinner = ora("Scanning for images...").start();
   const results = await scanPublicImages(targetDir);
   spinner.stop();
@@ -23998,7 +24063,7 @@ async function uploadImages(options) {
     const uploadSpinner = ora(`Uploading ${img.filename}...`).start();
     try {
       const result = await uploadImageToPortal(
-        path10.join(targetDir, img.filePath),
+        path12.join(targetDir, img.filePath),
         img,
         { apiUrl, apiKey, category: options.category }
       );
@@ -24017,7 +24082,7 @@ async function uploadImages(options) {
   }
   console.log("");
   if (uploaded.length > 0) {
-    const manifestPath = path10.join(targetDir, ".uptrade-images.json");
+    const manifestPath = path12.join(targetDir, IMAGE_MANIFEST);
     await fs3.writeFile(manifestPath, JSON.stringify({
       uploaded,
       timestamp: (/* @__PURE__ */ new Date()).toISOString()
@@ -24030,8 +24095,8 @@ async function uploadImages(options) {
   console.log("");
 }
 async function migrateImages(options) {
-  const targetDir = path10.resolve(options.dir || ".");
-  const manifestPath = path10.join(targetDir, ".uptrade-images.json");
+  const targetDir = path12.resolve(options.dir || ".");
+  const manifestPath = resolveImageManifestReadPath(targetDir);
   const apiUrl = process.env.SONOR_API_URL || "https://api.sonor.io";
   const apiKey = process.env.SONOR_API_KEY || "";
   if (!apiKey) {
@@ -24134,9 +24199,9 @@ async function migrateImages(options) {
   let successCount = 0;
   let failCount = 0;
   for (const [filePath, fileMigrations] of byFile) {
-    const fileSpinner = ora(`Migrating ${path10.basename(filePath)}...`).start();
+    const fileSpinner = ora(`Migrating ${path12.basename(filePath)}...`).start();
     try {
-      await migrateFileImages(path10.join(targetDir, filePath), fileMigrations);
+      await migrateFileImages(path12.join(targetDir, filePath), fileMigrations);
       successCount += fileMigrations.length;
       fileSpinner.succeed(`Migrated: ${filePath} (${fileMigrations.length} images)`);
     } catch (error2) {
@@ -24158,7 +24223,7 @@ async function migrateImages(options) {
   console.log("");
 }
 async function uploadAndMigrate(options) {
-  const targetDir = path10.resolve(options.dir || ".");
+  const targetDir = path12.resolve(options.dir || ".");
   const apiUrl = process.env.SONOR_API_URL || "https://api.sonor.io";
   const apiKey = process.env.SONOR_API_KEY || "";
   if (!apiKey) {
@@ -24225,7 +24290,7 @@ async function uploadAndMigrate(options) {
     const uploadSpinner = ora(`Uploading ${img.filename}...`).start();
     try {
       const result = await uploadImageToPortal(
-        path10.join(targetDir, img.filePath),
+        path12.join(targetDir, img.filePath),
         img,
         { apiUrl, apiKey, category: options.category }
       );
@@ -24297,9 +24362,9 @@ async function uploadAndMigrate(options) {
   let successCount = 0;
   let failCount = 0;
   for (const [filePath, fileMigrations] of byFile) {
-    const fileSpinner = ora(`Migrating ${path10.basename(filePath)}...`).start();
+    const fileSpinner = ora(`Migrating ${path12.basename(filePath)}...`).start();
     try {
-      await migrateFileImages(path10.join(targetDir, filePath), fileMigrations);
+      await migrateFileImages(path12.join(targetDir, filePath), fileMigrations);
       successCount += fileMigrations.length;
       fileSpinner.succeed(`Migrated: ${filePath} (${fileMigrations.length} images)`);
     } catch (error2) {
@@ -24307,7 +24372,7 @@ async function uploadAndMigrate(options) {
       fileSpinner.fail(`Failed: ${filePath} - ${error2.message}`);
     }
   }
-  const manifestPath = path10.join(targetDir, ".uptrade-images.json");
+  const manifestPath = path12.join(targetDir, IMAGE_MANIFEST);
   await fs3.writeFile(manifestPath, JSON.stringify({
     uploaded,
     criticalKeptLocal: criticalImages.map((i) => i.filename),
@@ -24334,8 +24399,8 @@ async function uploadAndMigrate(options) {
   console.log("");
 }
 async function replaceWithCdnUrls(options) {
-  const targetDir = path10.resolve(options.dir || ".");
-  const manifestPath = path10.join(targetDir, ".uptrade-images.json");
+  const targetDir = path12.resolve(options.dir || ".");
+  const manifestPath = resolveImageManifestReadPath(targetDir);
   let manifest;
   try {
     const content = await fs3.readFile(manifestPath, "utf-8");
@@ -24383,7 +24448,7 @@ async function replaceWithCdnUrls(options) {
               if (!seenFileLines.has(key)) {
                 seenFileLines.add(key);
                 replacements2.push({
-                  file: path10.relative(targetDir, file),
+                  file: path12.relative(targetDir, file),
                   localPath: pattern,
                   cdnUrl: img.publicUrl,
                   line: i + 1
@@ -24431,9 +24496,9 @@ async function replaceWithCdnUrls(options) {
   let successCount = 0;
   let failCount = 0;
   for (const [filePath, fileReplacements] of byFile) {
-    const fileSpinner = ora(`Updating ${path10.basename(filePath)}...`).start();
+    const fileSpinner = ora(`Updating ${path12.basename(filePath)}...`).start();
     try {
-      const fullPath = path10.join(targetDir, filePath);
+      const fullPath = path12.join(targetDir, filePath);
       let content = await fs3.readFile(fullPath, "utf-8");
       for (const r of fileReplacements) {
         const escaped = r.localPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -24461,8 +24526,8 @@ async function replaceWithCdnUrls(options) {
   console.log("");
 }
 async function refreshManifest(options) {
-  const targetDir = path10.resolve(options.dir || ".");
-  const manifestPath = path10.join(targetDir, ".uptrade-images.json");
+  const targetDir = path12.resolve(options.dir || ".");
+  const manifestPath = path12.join(targetDir, IMAGE_MANIFEST);
   const apiUrl = process.env.SONOR_API_URL || "https://api.sonor.io";
   const apiKey = process.env.SONOR_API_KEY || "";
   if (!apiKey) {
@@ -24471,7 +24536,7 @@ async function refreshManifest(options) {
   }
   let manifest;
   try {
-    const content = await fs3.readFile(manifestPath, "utf-8");
+    const content = await fs3.readFile(resolveImageManifestReadPath(targetDir), "utf-8");
     manifest = JSON.parse(content);
   } catch {
     console.log(source_default.yellow("  \u26A0 No upload manifest found"));
@@ -24524,12 +24589,12 @@ async function refreshManifest(options) {
 }
 async function findDataFiles(rootDir) {
   const files = [];
-  const excludeFiles = [".uptrade-images.json"];
+  const excludeFiles = [IMAGE_MANIFEST, LEGACY_IMAGE_MANIFEST];
   async function scan(dir) {
     try {
       const entries = await fs3.readdir(dir, { withFileTypes: true });
       for (const entry of entries) {
-        const fullPath = path10.join(dir, entry.name);
+        const fullPath = path12.join(dir, entry.name);
         if (entry.isDirectory()) {
           if (["node_modules", ".next", ".git", "dist", "build"].includes(entry.name)) {
             continue;
@@ -24539,7 +24604,7 @@ async function findDataFiles(rootDir) {
           if (excludeFiles.includes(entry.name)) {
             continue;
           }
-          const ext2 = path10.extname(entry.name).toLowerCase();
+          const ext2 = path12.extname(entry.name).toLowerCase();
           if ([".js", ".ts", ".json", ".jsx", ".tsx", ".mjs", ".cjs"].includes(ext2)) {
             files.push(fullPath);
           }
@@ -24552,16 +24617,16 @@ async function findDataFiles(rootDir) {
   return files;
 }
 async function scanPublicImages(rootDir) {
-  const publicDir = path10.join(rootDir, "public");
+  const publicDir = path12.join(rootDir, "public");
   const images = [];
   let totalSize = 0;
   let usageCount = 0;
   const imageFiles = await findImagesRecursive(publicDir);
   const sourceFiles = await findSourceFiles2(rootDir);
   for (const imagePath of imageFiles) {
-    const relPath = path10.relative(rootDir, imagePath);
-    const filename = path10.basename(imagePath);
-    const ext2 = path10.extname(filename).toLowerCase();
+    const relPath = path12.relative(rootDir, imagePath);
+    const filename = path12.basename(imagePath);
+    const ext2 = path12.extname(filename).toLowerCase();
     const stat = await fs3.stat(imagePath);
     const category = getCategoryFromPath(relPath);
     const suggestedSlotId = generateSlotId(relPath);
@@ -24587,11 +24652,11 @@ async function findImagesRecursive(dir, files = []) {
   try {
     const entries = await fs3.readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = path10.join(dir, entry.name);
+      const fullPath = path12.join(dir, entry.name);
       if (entry.isDirectory()) {
         await findImagesRecursive(fullPath, files);
       } else if (entry.isFile()) {
-        const ext2 = path10.extname(entry.name).toLowerCase();
+        const ext2 = path12.extname(entry.name).toLowerCase();
         if (IMAGE_EXTENSIONS.includes(ext2)) {
           files.push(fullPath);
         }
@@ -24604,7 +24669,7 @@ async function findImagesRecursive(dir, files = []) {
 async function findSourceFiles2(dir, files = []) {
   const entries = await fs3.readdir(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = path10.join(dir, entry.name);
+    const fullPath = path12.join(dir, entry.name);
     if (entry.isDirectory()) {
       if (["node_modules", ".next", ".git", "dist", "build", "public"].includes(entry.name)) {
         continue;
@@ -24620,8 +24685,8 @@ async function findSourceFiles2(dir, files = []) {
 }
 async function findImageUsages(imagePath, sourceFiles, rootDir) {
   const usages = [];
-  const filename = path10.basename(imagePath);
-  const relPath = path10.relative(path10.join(rootDir, "public"), imagePath);
+  const filename = path12.basename(imagePath);
+  const relPath = path12.relative(path12.join(rootDir, "public"), imagePath);
   const patterns = [
     `/${relPath}`,
     // /images/hero.jpg
@@ -24643,7 +24708,7 @@ async function findImageUsages(imagePath, sourceFiles, rootDir) {
         const elementType = detectElementType(line);
         const canAutoMigrate = ["img", "Image"].includes(elementType);
         usages.push({
-          filePath: path10.relative(rootDir, sourceFile),
+          filePath: path12.relative(rootDir, sourceFile),
           line: i + 1,
           elementType,
           altText: extractAltText(line),
@@ -24715,7 +24780,7 @@ function detectCriticalImage(filename, relPath, usages, fileSize) {
     (u) => u.filePath.includes("layout.") || u.filePath.includes("/layout/")
   );
   const usedInCriticalComponent = usages.some((u) => {
-    const fileName = path10.basename(u.filePath).toLowerCase();
+    const fileName = path12.basename(u.filePath).toLowerCase();
     return fileName.includes("header") || fileName.includes("navbar") || fileName.includes("nav.") || fileName.includes("hero") || fileName.includes("footer");
   });
   const isSiteLogo = SITE_LOGO_PATTERNS.some((p) => p.test(filename));
@@ -24851,7 +24916,7 @@ async function uploadAndMigrateImages(scanResults, options) {
   for (const img of scanResults.images) {
     try {
       const uploadResult = await uploadImageToPortal(
-        path10.join(rootDir, img.filePath),
+        path12.join(rootDir, img.filePath),
         img,
         {
           apiUrl: options.apiUrl,
@@ -24879,7 +24944,7 @@ async function uploadAndMigrateImages(scanResults, options) {
   }
   for (const [filePath, migrations] of byFile) {
     try {
-      await migrateFileImages(path10.join(rootDir, filePath), migrations);
+      await migrateFileImages(path12.join(rootDir, filePath), migrations);
       result.migrated += migrations.length;
     } catch (error2) {
       result.errors.push(`Migration failed for ${filePath}: ${error2.message}`);
@@ -24893,31 +24958,25 @@ async function migrateCommand(options) {
   console.log("");
   console.log(source_default.bold("  Site-Kit Migration"));
   console.log("");
-  const apiKey = process.env.SONOR_API_KEY;
-  const projectId = process.env.SONOR_PROJECT_ID;
-  if (!apiKey || !projectId) {
-    console.log(source_default.red("  \u2717 Missing environment variables"));
-    console.log(source_default.gray("    Run `sonor-setup init` first to configure your project."));
-    console.log("");
-    process.exit(1);
-  }
+  const { apiKey, projectId, apiUrl } = await loadConfig({ resolveProject: true });
   if (options.dryRun) {
     console.log(source_default.yellow("  Running in dry-run mode - no files will be modified"));
     console.log("");
   }
   if (options.file) {
-    const filePath = path10.resolve(options.file);
+    const filePath = path12.resolve(options.file);
     try {
       await fs3.access(filePath);
     } catch {
       console.log(source_default.red(`  \u2717 File not found: ${filePath}`));
       process.exit(1);
     }
-    const spinner = ora(`Migrating ${path10.basename(filePath)}...`).start();
+    const spinner = ora(`Migrating ${path12.basename(filePath)}...`).start();
     try {
       const result = await migrateFile(filePath, {
         projectId,
         apiKey,
+        apiUrl,
         dryRun: options.dryRun
       });
       if (result.success) {
@@ -24980,6 +25039,7 @@ async function migrateCommand(options) {
     const results = await migrateFiles(scanResults, {
       projectId,
       apiKey,
+      apiUrl,
       dryRun: options.dryRun
     });
     const successful = results.filter((r) => r.success);
@@ -25009,10 +25069,9 @@ async function migrateCommand(options) {
     process.exit(1);
   }
   console.log("");
-  await handleImageMigration(options, apiKey);
+  await handleImageMigration(options, apiKey, apiUrl);
 }
-async function handleImageMigration(options, apiKey, projectId) {
-  const apiUrl = process.env.SONOR_API_URL || "https://api.sonor.io";
+async function handleImageMigration(options, apiKey, apiUrl) {
   const imageScanSpinner = ora("Scanning for images...").start();
   let imageResults;
   try {
@@ -25076,17 +25135,11 @@ function formatBytes2(bytes) {
   return `${parseFloat((bytes / Math.pow(k2, i)).toFixed(1))} ${sizes[i]}`;
 }
 var SKIP_PROPS = ["href", "src", "className", "style", "onClick", "ref", "key", "id", "target", "rel", "type", "name", "variant", "size", "icon"];
-var API_URL2 = process.env.SONOR_API_URL || "https://api.sonor.io";
-var TEMPLATES_DIR = ".uptrade/templates";
+var TEMPLATES_DIR = path12.join(SONOR_STATE_DIR, "templates");
 async function locationsCommand(subcommand, arg, options) {
   console.log("");
   console.log(source_default.bold("  \u{1F4CD} Site-Kit Location Page Manager"));
   console.log("");
-  const config2 = await loadConfig();
-  if (!config2?.projectId) {
-    console.log(source_default.red("  \u2717 Not configured. Run `npx sonor-setup init` first."));
-    return;
-  }
   switch (subcommand) {
     case "template":
       if (!arg) {
@@ -25094,6 +25147,7 @@ async function locationsCommand(subcommand, arg, options) {
         console.log(source_default.gray("    Example: locations template ./app/services/plumbing/page.tsx"));
         return;
       }
+      await loadConfig();
       await templateCommand(arg, options);
       break;
     case "upload":
@@ -25101,17 +25155,17 @@ async function locationsCommand(subcommand, arg, options) {
         console.log(source_default.red("  \u2717 Usage: locations upload --template <name>"));
         return;
       }
-      await uploadCommand(options.template, config2);
+      await uploadCommand(options.template, await loadConfig({ resolveProject: true }));
       break;
     case "generate":
       if (!options.template) {
         console.log(source_default.red('  \u2717 Usage: locations generate --template <name> --locations "City, ST" ...'));
         return;
       }
-      await generateCommand(options, config2);
+      await generateCommand(options, await loadConfig({ resolveProject: true }));
       break;
     case "list":
-      await listCommand(config2);
+      await listCommand(await loadConfig({ resolveProject: true }));
       break;
     default:
       console.log(source_default.yellow("  Available subcommands:"));
@@ -25123,10 +25177,10 @@ async function locationsCommand(subcommand, arg, options) {
       console.log("");
   }
 }
-async function templateCommand(sourcePath, options, config2) {
+async function templateCommand(sourcePath, options) {
   const spinner = ora("Analyzing source page...").start();
   try {
-    const resolvedPath = path10.resolve(sourcePath);
+    const resolvedPath = path12.resolve(sourcePath);
     if (!existsSync(resolvedPath)) {
       spinner.fail(`File not found: ${sourcePath}`);
       return;
@@ -25139,8 +25193,8 @@ async function templateCommand(sourcePath, options, config2) {
     const slots = [];
     const componentNames = [];
     traverse(ast, {
-      JSXElement(path27) {
-        const openingElement = path27.node.openingElement;
+      JSXElement(path30) {
+        const openingElement = path30.node.openingElement;
         if (isJSXIdentifier(openingElement.name)) {
           const componentName = openingElement.name.name;
           if (componentName[0] === componentName[0].toUpperCase()) {
@@ -25180,8 +25234,9 @@ async function templateCommand(sourcePath, options, config2) {
       },
       managed_components: ["schema", "faqs", "metadata"]
     };
-    await fs3.mkdir(TEMPLATES_DIR, { recursive: true });
-    const templatePath = path10.join(TEMPLATES_DIR, `${templateName}.json`);
+    const templatesDir = path12.join(process.cwd(), TEMPLATES_DIR);
+    await fs3.mkdir(templatesDir, { recursive: true });
+    const templatePath = path12.join(templatesDir, `${templateName}.json`);
     await fs3.writeFile(templatePath, JSON.stringify(template, null, 2));
     console.log("");
     console.log(source_default.green("  \u2713 Template created:"), source_default.cyan(templatePath));
@@ -25260,7 +25315,7 @@ function inferGenerationHint(propName) {
   return void 0;
 }
 function inferTemplateName(sourcePath) {
-  const parts = sourcePath.split(path10.sep);
+  const parts = sourcePath.split(path12.sep);
   const pageIndex = parts.findIndex((p) => p === "page.tsx" || p === "page.jsx");
   if (pageIndex > 0) {
     return parts[pageIndex - 1];
@@ -25269,14 +25324,14 @@ function inferTemplateName(sourcePath) {
   return filtered[filtered.length - 1] || "template";
 }
 function inferSourcePagePath(sourcePath) {
-  const parts = sourcePath.split(path10.sep);
+  const parts = sourcePath.split(path12.sep);
   const appIndex = parts.findIndex((p) => p === "app" || p === "pages");
   if (appIndex >= 0) {
     const pathParts = parts.slice(appIndex + 1);
     const filtered = pathParts.filter((p) => !["page.tsx", "page.jsx", "index.tsx", "index.jsx"].includes(p));
     return "/" + filtered.join("/");
   }
-  return "/" + path10.basename(sourcePath, path10.extname(sourcePath));
+  return "/" + path12.basename(sourcePath, path12.extname(sourcePath));
 }
 function toSnakeCase(str) {
   return str.replace(/([A-Z])/g, "_$1").toLowerCase().replace(/^_/, "");
@@ -25288,22 +25343,22 @@ function truncate(str, maxLength) {
 async function uploadCommand(templateName, config2) {
   const spinner = ora("Uploading template to Portal...").start();
   try {
-    const templatePath = path10.join(TEMPLATES_DIR, `${templateName}.json`);
+    const templatePath = resolveStateReadPath(path12.join("templates", `${templateName}.json`));
     if (!existsSync(templatePath)) {
       spinner.fail(`Template not found: ${templatePath}`);
       console.log(source_default.gray(`  Run: npx sonor-setup locations template <page> --name ${templateName}`));
       return;
     }
     const template = JSON.parse(readFileSync(templatePath, "utf-8"));
-    const response = await fetch(`${API_URL2}/seo/location-templates`, {
+    const response = await fetch(`${config2.apiUrl}/seo/location-templates`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
         "Authorization": `Bearer ${config2.apiKey}`
       },
       body: JSON.stringify({
-        project_id: config2.projectId,
-        ...template
+        ...template,
+        project_id: config2.projectId
       })
     });
     if (!response.ok) {
@@ -25311,11 +25366,11 @@ async function uploadCommand(templateName, config2) {
       if (response.status === 409) {
         spinner.text = "Template exists, updating...";
         const existing = await fetch(
-          `${API_URL2}/seo/location-templates/by-name/${templateName}?project_id=${config2.projectId}`,
+          `${config2.apiUrl}/seo/location-templates/by-name/${templateName}?project_id=${config2.projectId}`,
           { headers: { "Authorization": `Bearer ${config2.apiKey}` } }
         );
         const existingData = await existing.json();
-        const updateResponse = await fetch(`${API_URL2}/seo/location-templates/${existingData.id}`, {
+        const updateResponse = await fetch(`${config2.apiUrl}/seo/location-templates/${existingData.id}`, {
           method: "PUT",
           headers: {
             "Content-Type": "application/json",
@@ -25364,7 +25419,7 @@ async function generateCommand(options, config2) {
   }
   const spinner = ora(`Generating ${type || "service-location"} pages...`).start();
   try {
-    const response = await fetch(`${API_URL2}/seo/location-pages/generate`, {
+    const response = await fetch(`${config2.apiUrl}/seo/location-pages/generate`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -25404,7 +25459,7 @@ async function listCommand(config2) {
   const spinner = ora("Fetching templates...").start();
   try {
     const response = await fetch(
-      `${API_URL2}/seo/location-templates?project_id=${config2.projectId}`,
+      `${config2.apiUrl}/seo/location-templates?project_id=${config2.projectId}`,
       { headers: { "Authorization": `Bearer ${config2.apiKey}` } }
     );
     if (!response.ok) {
@@ -25429,69 +25484,21 @@ async function listCommand(config2) {
       });
     }
     console.log("");
-    if (existsSync(TEMPLATES_DIR)) {
-      const files = await fs3.readdir(TEMPLATES_DIR);
-      const localTemplates = files.filter((f) => f.endsWith(".json"));
-      if (localTemplates.length > 0) {
-        console.log(source_default.gray("  Local (not uploaded):"));
-        localTemplates.forEach((f) => {
-          console.log(source_default.gray(`    \u2022 ${f.replace(".json", "")}`));
-        });
-        console.log("");
-      }
+    const localTemplates = await listLocalTemplates();
+    if (localTemplates.length > 0) {
+      console.log(source_default.gray("  Local (not uploaded):"));
+      localTemplates.forEach((f) => {
+        console.log(source_default.gray(`    \u2022 ${f.replace(".json", "")}`));
+      });
+      console.log("");
     }
   } catch (error2) {
     spinner.fail(`Failed to fetch templates: ${error2.message}`);
   }
 }
-async function loadConfig() {
-  const configPath = path10.join(".uptrade", "config.json");
-  if (existsSync(configPath)) {
-    try {
-      const config2 = JSON.parse(readFileSync(configPath, "utf-8"));
-      return {
-        projectId: config2.projectId || config2.project_id,
-        apiKey: config2.apiKey || config2.api_key
-      };
-    } catch {
-      return null;
-    }
-  }
-  const projectId = process.env.SONOR_PROJECT_ID;
-  const apiKey = process.env.SONOR_API_KEY;
-  if (projectId && apiKey) {
-    return { projectId, apiKey };
-  }
-  return null;
-}
-var API_URL3 = process.env.SONOR_API_URL || "https://api.sonor.io";
-async function loadConfig2() {
-  const configPath = path10.join(".uptrade", "config.json");
-  if (existsSync(configPath)) {
-    try {
-      const config2 = JSON.parse(readFileSync(configPath, "utf-8"));
-      return {
-        projectId: config2.projectId || config2.project_id,
-        apiKey: config2.apiKey || config2.api_key
-      };
-    } catch {
-      return null;
-    }
-  }
-  const projectId = process.env.SONOR_PROJECT_ID;
-  const apiKey = process.env.SONOR_API_KEY;
-  if (projectId && apiKey) return { projectId, apiKey };
-  return null;
-}
 async function faqsCommand(subcommand, options) {
   console.log("");
-  const config2 = await loadConfig2();
-  if (!config2?.projectId || !config2?.apiKey) {
-    console.log(source_default.red("  \u2717 Not configured. Run `npx sonor-setup init` first."));
-    console.log(source_default.gray("    Set SONOR_API_KEY, or use .uptrade/config.json"));
-    console.log("");
-    return;
-  }
+  const config2 = await loadConfig({ resolveProject: true });
   switch (subcommand) {
     case "extract":
       await extractCommand(options, config2);
@@ -25541,7 +25548,7 @@ async function extractCommand(options, config2) {
   const faqContexts = [];
   for (const faq of faqSections) {
     try {
-      const fullPath = path10.resolve(process.cwd(), faq.filePath);
+      const fullPath = path12.resolve(process.cwd(), faq.filePath);
       const content = await fs3.readFile(fullPath, "utf-8");
       let pagePath = faq.filePath.replace(/^app\//, "/").replace(/^src\/app\//, "/").replace(/\/page\.(tsx?|jsx?)$/, "").replace(/\[([^\]]+)\]/g, ":$1");
       if (pagePath === "" || pagePath === "/page") pagePath = "/";
@@ -25556,7 +25563,7 @@ async function extractCommand(options, config2) {
           if (importPath.startsWith("@/")) {
             resolvedPath = importPath.replace("@/", "./");
           } else if (importPath.startsWith(".")) {
-            resolvedPath = path10.resolve(path10.dirname(fullPath), importPath);
+            resolvedPath = path12.resolve(path12.dirname(fullPath), importPath);
           }
           const extensions = ["", ".js", ".ts", ".jsx", ".tsx", ".json"];
           for (const ext2 of extensions) {
@@ -25601,7 +25608,7 @@ async function extractCommand(options, config2) {
   }
   const extractSpinner = ora("Extracting FAQs via AI...").start();
   try {
-    const response = await fetch(`${API_URL3}/seo/managed/faqs/extract`, {
+    const response = await fetch(`${config2.apiUrl}/seo/managed/faqs/extract`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -25636,7 +25643,7 @@ async function extractCommand(options, config2) {
     let failed = 0;
     for (const faq of extractedFaqs) {
       try {
-        const res = await fetch(`${API_URL3}/seo/managed/faqs`, {
+        const res = await fetch(`${config2.apiUrl}/seo/managed/faqs`, {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
@@ -25661,7 +25668,7 @@ async function extractCommand(options, config2) {
           uploaded++;
           console.log(source_default.green(`  \u2713 ${faq.path}`) + source_default.gray(` (${faq.items.length} items)`));
         } else if (res.status === 409 || res.status === 400) {
-          const updateRes = await fetch(`${API_URL3}/seo/managed/faqs/by-path`, {
+          const updateRes = await fetch(`${config2.apiUrl}/seo/managed/faqs/by-path`, {
             method: "PUT",
             headers: {
               "Content-Type": "application/json",
@@ -25748,7 +25755,7 @@ async function syncCommand(options, config2) {
   const listSpinner = ora("Fetching existing FAQ sections from Portal...").start();
   let existing = [];
   try {
-    const res = await fetch(`${API_URL3}/seo/managed/faqs/project/${config2.projectId}`, {
+    const res = await fetch(`${config2.apiUrl}/seo/managed/faqs/project/${config2.projectId}`, {
       headers: { Authorization: `Bearer ${config2.apiKey}` }
     });
     if (!res.ok) {
@@ -25777,7 +25784,7 @@ async function syncCommand(options, config2) {
   let failed = 0;
   for (const p of toCreate) {
     try {
-      const res = await fetch(`${API_URL3}/seo/managed/faqs`, {
+      const res = await fetch(`${config2.apiUrl}/seo/managed/faqs`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -25814,44 +25821,12 @@ async function syncCommand(options, config2) {
   console.log(source_default.gray("    Add questions and answers there; they will appear on your site."));
   console.log("");
 }
-function getApiUrl() {
-  return process.env.SONOR_API_URL || "https://api.sonor.io";
-}
-async function loadConfig3() {
-  const configPath = path10.join(".uptrade", "config.json");
-  if (existsSync(configPath)) {
-    try {
-      const config2 = JSON.parse(readFileSync(configPath, "utf-8"));
-      return {
-        projectId: config2.projectId || config2.project_id,
-        apiKey: config2.apiKey || config2.api_key,
-        siteUrl: config2.siteUrl || config2.site_url,
-        businessInfo: config2.businessInfo || config2.business_info
-      };
-    } catch {
-      return null;
-    }
-  }
-  const projectId = process.env.SONOR_PROJECT_ID;
-  const apiKey = process.env.SONOR_API_KEY;
-  const siteUrl = process.env.NEXT_PUBLIC_SITE_URL || process.env.SITE_URL;
-  if (projectId && apiKey) {
-    return { projectId, apiKey, siteUrl };
-  }
-  return null;
-}
 async function setupCommand(options) {
   console.log("");
   console.log(source_default.bold.blue("  \u{1F680} Signal-Enhanced SEO Setup"));
   console.log(source_default.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
   console.log("");
-  const config2 = await loadConfig3();
-  if (!config2?.projectId || !config2?.apiKey) {
-    console.log(source_default.red("  \u2717 Not configured. Run `npx sonor-setup init` first."));
-    console.log(source_default.gray("    Set SONOR_API_KEY"));
-    console.log("");
-    return;
-  }
+  const config2 = await loadConfig();
   const capabilities = [];
   if (options.faqsOnly) {
     capabilities.push("extract_faqs");
@@ -25949,14 +25924,13 @@ async function setupCommand(options) {
     const batch = batches[batchIndex];
     const batchSpinner = ora(`Batch ${batchIndex + 1}/${batches.length}: Analyzing ${batch.length} pages...`).start();
     try {
-      const response = await fetch(`${getApiUrl()}/api/public/seo/site-setup`, {
+      const response = await fetch(`${config2.apiUrl}/api/public/seo/site-setup`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
           "x-api-key": config2.apiKey
         },
         body: JSON.stringify({
-          project_id: config2.projectId,
           site_url: config2.siteUrl || "https://example.com",
           // Only send business_info on first batch (for org schema)
           business_info: batchIndex === 0 ? config2.businessInfo : void 0,
@@ -26048,10 +26022,10 @@ async function setupCommand(options) {
 }
 async function scanForPageFiles(rootDir) {
   const pages = [];
-  const appDir = path10.join(rootDir, "app");
-  const srcAppDir = path10.join(rootDir, "src", "app");
-  const pagesDir = path10.join(rootDir, "pages");
-  const srcPagesDir = path10.join(rootDir, "src", "pages");
+  const appDir = path12.join(rootDir, "app");
+  const srcAppDir = path12.join(rootDir, "src", "app");
+  const pagesDir = path12.join(rootDir, "pages");
+  const srcPagesDir = path12.join(rootDir, "src", "pages");
   const dirs = [appDir, srcAppDir, pagesDir, srcPagesDir];
   for (const dir of dirs) {
     if (existsSync(dir)) {
@@ -26063,7 +26037,7 @@ async function scanForPageFiles(rootDir) {
 async function scanDirectory(dir, baseDir, pages) {
   const entries = await fs3.readdir(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = path10.join(dir, entry.name);
+    const fullPath = path12.join(dir, entry.name);
     if (entry.isDirectory()) {
       if (entry.name.startsWith(".") || entry.name === "node_modules" || entry.name === "api") {
         continue;
@@ -26074,8 +26048,8 @@ async function scanDirectory(dir, baseDir, pages) {
       const isLegacyPage = baseDir.includes("/pages") && entry.name.match(/\.(tsx?|jsx?)$/) && !entry.name.startsWith("_");
       if (isPage || isLegacyPage) {
         const content = await fs3.readFile(fullPath, "utf-8");
-        const relativePath = path10.relative(baseDir, fullPath);
-        let pagePath = "/" + path10.dirname(relativePath).replace(/\\/g, "/").replace(/\/page$/, "");
+        const relativePath = path12.relative(baseDir, fullPath);
+        let pagePath = "/" + path12.dirname(relativePath).replace(/\\/g, "/").replace(/\/page$/, "");
         pagePath = pagePath.replace(/\[([^\]]+)\]/g, ":$1").replace(/^\/\.$/, "/");
         if (pagePath === "/.") pagePath = "/";
         pages.push({
@@ -26095,10 +26069,10 @@ async function gatherImportedFiles(page, rootDir) {
     if (importPath.toLowerCase().includes("faq") || importPath.includes("@/data") || importPath.includes("./data") || importPath.includes("../data") || importPath.includes("/constants") || importPath.includes("/content") || importPath.includes("practice-areas") || importPath.includes("subpages") || importPath.includes("pages-data")) {
       let resolvedPath = importPath;
       if (importPath.startsWith("@/")) {
-        resolvedPath = path10.join(rootDir, importPath.replace("@/", ""));
+        resolvedPath = path12.join(rootDir, importPath.replace("@/", ""));
       } else if (importPath.startsWith(".")) {
-        const pageDir = path10.dirname(path10.join(rootDir, "app", page.filePath));
-        resolvedPath = path10.resolve(pageDir, importPath);
+        const pageDir = path12.dirname(path12.join(rootDir, "app", page.filePath));
+        resolvedPath = path12.resolve(pageDir, importPath);
       }
       const extensions = ["", ".js", ".ts", ".jsx", ".tsx", ".json"];
       for (const ext2 of extensions) {
@@ -26154,20 +26128,20 @@ async function expandDynamicRoutes(pages, rootDir) {
 async function findDynamicRouteData(page, parentPath, rootDir) {
   const results = [];
   const dataFilePaths = [
-    path10.join(rootDir, "data", "practice-areas.js"),
-    path10.join(rootDir, "data", "practice-areas.ts"),
-    path10.join(rootDir, "data", "personal-injury-pages.js"),
-    path10.join(rootDir, "data", "personal-injury-pages.ts"),
-    path10.join(rootDir, "data", "pages.js"),
-    path10.join(rootDir, "data", "pages.ts"),
-    path10.join(rootDir, "data", "content.js"),
-    path10.join(rootDir, "data", "content.ts"),
-    path10.join(rootDir, "data", "services.js"),
-    path10.join(rootDir, "data", "services.ts"),
-    path10.join(rootDir, "data", "subpages.js"),
-    path10.join(rootDir, "data", "subpages.ts"),
-    path10.join(rootDir, "src", "data", "practice-areas.js"),
-    path10.join(rootDir, "src", "data", "practice-areas.ts")
+    path12.join(rootDir, "data", "practice-areas.js"),
+    path12.join(rootDir, "data", "practice-areas.ts"),
+    path12.join(rootDir, "data", "personal-injury-pages.js"),
+    path12.join(rootDir, "data", "personal-injury-pages.ts"),
+    path12.join(rootDir, "data", "pages.js"),
+    path12.join(rootDir, "data", "pages.ts"),
+    path12.join(rootDir, "data", "content.js"),
+    path12.join(rootDir, "data", "content.ts"),
+    path12.join(rootDir, "data", "services.js"),
+    path12.join(rootDir, "data", "services.ts"),
+    path12.join(rootDir, "data", "subpages.js"),
+    path12.join(rootDir, "data", "subpages.ts"),
+    path12.join(rootDir, "src", "data", "practice-areas.js"),
+    path12.join(rootDir, "src", "data", "practice-areas.ts")
   ];
   const routeSegment = parentPath.replace(/^\//, "").split("/")[0];
   const routeSegmentNormalized = routeSegment.replace(/-/g, "");
@@ -26259,7 +26233,7 @@ async function uploadFaqs(pages, config2) {
   for (const page of pages) {
     if (!page.faqs?.items?.length) continue;
     try {
-      const res = await fetch(`${getApiUrl()}/api/public/seo/register-faq`, {
+      const res = await fetch(`${config2.apiUrl}/api/public/seo/register-faq`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -26294,7 +26268,7 @@ async function uploadFaqs(pages, config2) {
 async function uploadSchemas(pages, globalSchema, config2) {
   if (globalSchema) {
     try {
-      const res = await fetch(`${getApiUrl()}/api/public/seo/register-schema`, {
+      const res = await fetch(`${config2.apiUrl}/api/public/seo/register-schema`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -26320,7 +26294,7 @@ async function uploadSchemas(pages, globalSchema, config2) {
     if (!page.schemas?.length) continue;
     for (const schema of page.schemas) {
       try {
-        const res = await fetch(`${getApiUrl()}/api/public/seo/register-schema`, {
+        const res = await fetch(`${config2.apiUrl}/api/public/seo/register-schema`, {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
@@ -26344,8 +26318,7 @@ async function uploadSchemas(pages, globalSchema, config2) {
     }
   }
 }
-var APP_DIRS = ["app", path10.join("src", "app")];
-var CARD_FILE = /^(opengraph-image|twitter-image)\b.*\.(png|jpe?g|gif|webp)$/i;
+var CARD_FILE = /^(opengraph-image|twitter-image)\b.*\.(png|jpe?g|gif|webp|tsx|ts|jsx|js)$/i;
 function safeExists(p) {
   try {
     return fs__default.existsSync(p);
@@ -26364,19 +26337,19 @@ function findPageCards(cwd) {
     }
     for (const entry of entries) {
       if (entry.name.startsWith(".") || entry.name === "node_modules") continue;
-      const full = path10.join(dir, entry.name);
+      const full = path12.join(dir, entry.name);
       if (entry.isDirectory()) walk(full);
       else if (CARD_FILE.test(entry.name)) found.push(full);
     }
   };
-  for (const rel of APP_DIRS) walk(path10.join(cwd, rel));
+  for (const rel of NEXT_APP_DIRS) walk(path12.join(cwd, rel));
   return found;
 }
 function readOgWiring(cwd) {
   const siteCard = ["public/og.png", "public/og.jpg", "public/opengraph.png"].some(
-    (rel) => safeExists(path10.join(cwd, rel))
+    (rel) => safeExists(path12.join(cwd, rel))
   );
-  const layoutPath = ["app/layout.tsx", "src/app/layout.tsx"].map((rel) => path10.join(cwd, rel)).find(safeExists);
+  const layoutPath = findRootLayout(cwd);
   let layout = "";
   if (layoutPath) {
     try {
@@ -26396,7 +26369,12 @@ function readOgWiring(cwd) {
 function judgeOgWiring(facts) {
   const problems = [];
   if (!facts.layoutFound) {
-    return [{ message: "no app/layout.tsx found to verify metadata", fix: "Run this from the site root." }];
+    return [
+      {
+        message: "no root layout (app/layout.{tsx,ts,jsx,js} or src/app/layout.*) found to verify metadata",
+        fix: "Run this from the site root."
+      }
+    ];
   }
   if (!facts.siteCard && !facts.pageCards.length) {
     return [
@@ -26443,7 +26421,7 @@ var SSR_BAILOUT_FIX = `Keep the layout: ${LAYOUT_ALREADY_DEFERS}, so it is not t
 var ANALYTICS_WRAPPER_FIX = `Remove the <AnalyticsProvider> wrapper: ${LAYOUT_ALREADY_DEFERS} (configure it with analytics={{ ... }}). Track custom events with trackEvent / trackConversion from @sonordev/site-kit/analytics, which need no provider, instead of useAnalytics(). ` + LEGACY_STOPGAP;
 
 // src/cli/agent/checks.ts
-var API_URL4 = process.env.SONOR_API_URL || "https://api.sonor.io";
+var API_URL = process.env.SONOR_API_URL || "https://api.sonor.io";
 async function readFileOrNull(p) {
   try {
     return await fs3.readFile(p, "utf-8");
@@ -26451,26 +26429,6 @@ async function readFileOrNull(p) {
     return null;
   }
 }
-async function findFirst(cwd, candidates) {
-  for (const rel of candidates) {
-    const full = path10.join(cwd, rel);
-    if (await readFileOrNull(full)) return full;
-  }
-  return null;
-}
-var LAYOUT_CANDIDATES = [
-  "app/layout.tsx",
-  "app/layout.jsx",
-  "src/app/layout.tsx",
-  "src/app/layout.jsx"
-];
-var SITEMAP_CANDIDATES = [
-  "app/sitemap.ts",
-  "app/sitemap.tsx",
-  "app/sitemap.js",
-  "src/app/sitemap.ts",
-  "src/app/sitemap.tsx"
-];
 function checkApiKeyEnv() {
   const key = process.env.SONOR_API_KEY;
   if (key && key.startsWith("sonor_")) {
@@ -26505,7 +26463,7 @@ function checkApiKeyEnv() {
   };
 }
 async function checkPackageInstalled(cwd) {
-  const raw = await readFileOrNull(path10.join(cwd, "package.json"));
+  const raw = await readFileOrNull(path12.join(cwd, "package.json"));
   if (!raw) {
     return {
       id: "package.installed",
@@ -26557,7 +26515,7 @@ async function checkPackageInstalled(cwd) {
   };
 }
 async function checkSiteKitLayout(cwd) {
-  const layoutPath = await findFirst(cwd, LAYOUT_CANDIDATES);
+  const layoutPath = findRootLayout(cwd);
   if (!layoutPath) {
     return {
       id: "layout.sitekit",
@@ -26569,7 +26527,7 @@ async function checkSiteKitLayout(cwd) {
     };
   }
   const content = await readFileOrNull(layoutPath) || "";
-  const rel = path10.relative(cwd, layoutPath);
+  const rel = path12.relative(cwd, layoutPath);
   if (content.includes("SiteKitLayout")) {
     return {
       id: "layout.sitekit",
@@ -26601,8 +26559,8 @@ async function checkSiteKitLayout(cwd) {
   };
 }
 async function checkSitemap(cwd) {
-  const sitemapPath = await findFirst(cwd, SITEMAP_CANDIDATES);
-  if (!sitemapPath) {
+  const sitemapRel = findSitemapRoute(cwd);
+  if (!sitemapRel) {
     return {
       id: "sitemap.managed",
       title: "Sitemap",
@@ -26612,7 +26570,7 @@ async function checkSitemap(cwd) {
       fixCommand: "npx sonor-setup scaffold --yes"
     };
   }
-  const content = await readFileOrNull(sitemapPath) || "";
+  const content = await readFileOrNull(path12.join(cwd, sitemapRel)) || "";
   if (content.includes("createSitemap") || content.includes("@sonordev/site-kit")) {
     return { id: "sitemap.managed", title: "Sitemap", level: "ok", message: "Using Site-Kit sitemap" };
   }
@@ -26625,7 +26583,7 @@ async function checkSitemap(cwd) {
   };
 }
 async function checkPostbuildSitemap(cwd) {
-  const raw = await readFileOrNull(path10.join(cwd, "package.json"));
+  const raw = await readFileOrNull(path12.join(cwd, "package.json"));
   let pkg = {};
   try {
     pkg = raw ? JSON.parse(raw) : {};
@@ -26662,18 +26620,18 @@ async function checkPostbuildSitemap(cwd) {
 async function checkApiReachable(timeoutMs = 5e3) {
   const key = process.env.SONOR_API_KEY;
   try {
-    const res = await fetch(`${API_URL4}/health`, {
+    const res = await fetch(`${API_URL}/health`, {
       headers: key ? { "x-api-key": key } : {},
       signal: AbortSignal.timeout(timeoutMs)
     });
     if (res.ok) {
-      return { id: "api.reachable", title: "Sonor API", level: "ok", message: `Reachable (${API_URL4})` };
+      return { id: "api.reachable", title: "Sonor API", level: "ok", message: `Reachable (${API_URL})` };
     }
     return {
       id: "api.reachable",
       title: "Sonor API",
       level: "warn",
-      message: `HTTP ${res.status} from ${API_URL4}`
+      message: `HTTP ${res.status} from ${API_URL}`
     };
   } catch (err) {
     return {
@@ -26698,7 +26656,7 @@ async function checkKeyValid(timeoutMs = 8e3) {
     };
   }
   try {
-    const res = await fetch(`${API_URL4}/api/public/seo/verify-api-key`, {
+    const res = await fetch(`${API_URL}/api/public/seo/verify-api-key`, {
       headers: { "x-api-key": key },
       signal: AbortSignal.timeout(timeoutMs)
     });
@@ -26801,7 +26759,7 @@ async function checkClientAuth(timeoutMs = 8e3) {
   }
   const qs2 = host ? `?host=${encodeURIComponent(host)}` : "";
   try {
-    const res = await fetch(`${API_URL4}/api/public/site-token/status${qs2}`, {
+    const res = await fetch(`${API_URL}/api/public/site-token/status${qs2}`, {
       headers: { "x-api-key": key },
       signal: AbortSignal.timeout(timeoutMs)
     });
@@ -26946,7 +26904,7 @@ async function checkSsrRenderFromUrl(url, timeoutMs = 12e3) {
   }
 }
 async function checkSsrRenderFromBuild(cwd) {
-  const appDir = path10.join(cwd, ".next", "server", "app");
+  const appDir = path12.join(cwd, ".next", "server", "app");
   let entries;
   try {
     entries = await fs3.readdir(appDir);
@@ -26969,7 +26927,7 @@ async function checkSsrRenderFromBuild(cwd) {
       detail: "The root route may be fully dynamic. Pass --url to verify a running instance."
     };
   }
-  const html = await readFileOrNull(path10.join(appDir, htmlName)) || "";
+  const html = await readFileOrNull(path12.join(appDir, htmlName)) || "";
   const { rendered, contentTags } = looksServerRendered(html);
   if (rendered) {
     return {
@@ -26990,9 +26948,8 @@ async function checkSsrRenderFromBuild(cwd) {
 }
 async function checkNetlifyMiddleware(cwd) {
   const runtimeRe = /runtime\s*[:=]\s*['"](nodejs|edge)['"]/;
-  const proxyFiles = ["proxy.ts", "proxy.js", "src/proxy.ts", "src/proxy.js"];
-  for (const rel of proxyFiles) {
-    const content = await readFileOrNull(path10.join(cwd, rel));
+  for (const rel of NEXT_PROXY_FILES) {
+    const content = await readFileOrNull(path12.join(cwd, rel));
     if (content === null) continue;
     if (runtimeRe.test(content)) {
       return {
@@ -27007,9 +26964,8 @@ async function checkNetlifyMiddleware(cwd) {
     }
     return { id: "middleware.netlify", title: "Proxy / middleware", level: "ok", message: `${rel} present` };
   }
-  const middlewareFiles = ["middleware.ts", "middleware.js", "src/middleware.ts", "src/middleware.js"];
-  for (const rel of middlewareFiles) {
-    const content = await readFileOrNull(path10.join(cwd, rel));
+  for (const rel of NEXT_MIDDLEWARE_FILES) {
+    const content = await readFileOrNull(path12.join(cwd, rel));
     if (content === null) continue;
     if (/runtime\s*[:=]\s*['"]nodejs['"]/.test(content)) {
       return {
@@ -27036,7 +26992,7 @@ async function checkNetlifyMiddleware(cwd) {
 }
 async function checkImageDimsDrift(cwd) {
   const scanRoots = ["app", "src/app", "components", "src/components"];
-  const publicDir = path10.join(cwd, "public");
+  const publicDir = path12.join(cwd, "public");
   const files = [];
   async function walk(dir, depth) {
     if (depth > 4) return;
@@ -27048,19 +27004,19 @@ async function checkImageDimsDrift(cwd) {
     }
     for (const e of entries) {
       if (e.name === "node_modules" || e.name.startsWith(".")) continue;
-      const full = path10.join(dir, e.name);
+      const full = path12.join(dir, e.name);
       if (e.isDirectory()) await walk(full, depth + 1);
       else if (/\.(tsx|jsx)$/.test(e.name)) files.push(full);
     }
   }
-  for (const root of scanRoots) await walk(path10.join(cwd, root), 0);
+  for (const root of scanRoots) await walk(path12.join(cwd, root), 0);
   if (files.length === 0) {
     return { id: "images.dims-drift", title: "Image dims vs SVG", level: "skip", message: "No component files found" };
   }
   const viewBoxCache = /* @__PURE__ */ new Map();
   async function svgAspect(publicPath) {
     if (viewBoxCache.has(publicPath)) return viewBoxCache.get(publicPath);
-    const svg = await readFileOrNull(path10.join(publicDir, publicPath.replace(/^\//, "")));
+    const svg = await readFileOrNull(path12.join(publicDir, publicPath.replace(/^\//, "")));
     let aspect = null;
     if (svg) {
       const vb = svg.match(/viewBox="([\d.\s-]+)"/);
@@ -27087,7 +27043,7 @@ async function checkImageDimsDrift(cwd) {
       const drift = Math.abs(declared - actual) / actual;
       if (drift > 0.02) {
         drifts.push(
-          `${path10.relative(cwd, file)}: ${src} is ${actual.toFixed(2)}:1 but width/height declare ${declared.toFixed(2)}:1 (${Math.round(drift * 100)}% off)`
+          `${path12.relative(cwd, file)}: ${src} is ${actual.toFixed(2)}:1 but width/height declare ${declared.toFixed(2)}:1 (${Math.round(drift * 100)}% off)`
         );
       }
     }
@@ -27203,8 +27159,8 @@ async function statusCommand(options) {
 
 // src/og/pages.ts
 var DYNAMIC = "*";
-function pathSegments(path27) {
-  return path27.split("/").filter(Boolean);
+function pathSegments(path30) {
+  return path30.split("/").filter(Boolean);
 }
 function stripBrandSuffix(title, brand) {
   const cleaned = title.replace(/\s*[|–—-]\s*[^|–—-]+$/, "").trim();
@@ -27212,13 +27168,13 @@ function stripBrandSuffix(title, brand) {
   if (brand && cleaned.toLowerCase() === brand.toLowerCase()) return title.trim();
   return cleaned;
 }
-function titleFromPath(path27) {
-  const last = pathSegments(path27).filter((s) => s !== DYNAMIC).pop();
+function titleFromPath(path30) {
+  const last = pathSegments(path30).filter((s) => s !== DYNAMIC).pop();
   if (!last) return "Home";
   return last.replace(/[-_]+/g, " ").replace(/\b\w/g, (c) => c.toUpperCase()).trim();
 }
-function kickerFromPath(path27, fallback) {
-  const parts = pathSegments(path27);
+function kickerFromPath(path30, fallback) {
+  const parts = pathSegments(path30);
   const section = parts.includes(DYNAMIC) ? parts.filter((s) => s !== DYNAMIC) : parts.slice(0, -1);
   if (!section.length) return fallback;
   return section.join(" / ").replace(/[-_]+/g, " ");
@@ -27242,8 +27198,8 @@ function kickerIsRedundant(kicker, title) {
   const titleWords = new Set(t.split(" "));
   return k2.split(" ").every((w) => titleWords.has(w));
 }
-function slugForPath(path27) {
-  const segments = pathSegments(path27);
+function slugForPath(path30) {
+  const segments = pathSegments(path30);
   if (!segments.length) return "home";
   return segments.map((s) => s === DYNAMIC ? "any" : s).join("-").replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").toLowerCase();
 }
@@ -27297,10 +27253,10 @@ function findChrome() {
   }
   return null;
 }
-async function loadConfig4(cwd) {
+async function loadConfig2(cwd) {
   const candidates = ["og.config.ts", "og.config.mts", "og.config.mjs", "og.config.js"];
   for (const rel of candidates) {
-    const full = path10.join(cwd, rel);
+    const full = path12.join(cwd, rel);
     if (!existsSync(full)) continue;
     try {
       const mod = await import(
@@ -27325,7 +27281,7 @@ async function loadConfig4(cwd) {
   return null;
 }
 async function seedConfig(cwd) {
-  let name = path10.basename(cwd).replace(/-nextjs$/, "").replace(/-/g, " ");
+  let name = path12.basename(cwd).replace(/-nextjs$/, "").replace(/-/g, " ");
   let accent = "#111111";
   let logo;
   try {
@@ -27338,7 +27294,7 @@ async function seedConfig(cwd) {
   } catch {
   }
   for (const candidate of ["/logo-mark.svg", "/logo.svg", "/logohorizontal.svg"]) {
-    if (existsSync(path10.join(cwd, "public", candidate))) {
+    if (existsSync(path12.join(cwd, "public", candidate))) {
       logo = candidate;
       break;
     }
@@ -27352,14 +27308,14 @@ async function seedConfig(cwd) {
 }
 function inlinePublicPaths(html, cwd) {
   return html.replace(/src="(\/[^"]+)"/g, (_3, p) => {
-    const full = path10.join(cwd, "public", p);
+    const full = path12.join(cwd, "public", p);
     return existsSync(full) ? `src="file://${full}"` : `src="${p}"`;
   });
 }
 async function renderCard(config2, outPath, cwd, chrome, tmpSuffix) {
-  const tmpHtml = path10.join(cwd, `.sonor-og-${tmpSuffix}.html`);
+  const tmpHtml = path12.join(cwd, `.sonor-og-${tmpSuffix}.html`);
   try {
-    await fs3.mkdir(path10.dirname(outPath), { recursive: true });
+    await fs3.mkdir(path12.dirname(outPath), { recursive: true });
     await fs3.writeFile(tmpHtml, inlinePublicPaths(buildOgHtml(config2), cwd));
     const { stdout } = await execFileAsync5(
       chrome,
@@ -27394,7 +27350,7 @@ function parseReport(dom) {
 }
 async function compressCard(pngPath, cwd) {
   try {
-    const require_ = (await import('module')).createRequire(path10.join(cwd, "package.json"));
+    const require_ = (await import('module')).createRequire(path12.join(cwd, "package.json"));
     const sharp = require_("sharp");
     const jpgPath = pngPath.replace(/\.png$/, ".jpg");
     await sharp(pngPath).jpeg({ quality: 84, mozjpeg: true }).toFile(jpgPath);
@@ -27404,6 +27360,9 @@ async function compressCard(pngPath, cwd) {
     return pngPath;
   }
 }
+function codeOgImageFile(dir) {
+  return findConventionFile(dir, "opengraph-image");
+}
 function discoverDynamicSegments(appDir) {
   const found = [];
   const walk = (dir, urlSegments, pattern) => {
@@ -27411,14 +27370,13 @@ function discoverDynamicSegments(appDir) {
       if (!entry.isDirectory()) continue;
       if (entry.name.startsWith("_") || entry.name.startsWith(".")) continue;
       if (entry.name === "api" || entry.name === "node_modules") continue;
-      const full = path10.join(dir, entry.name);
+      const full = path12.join(dir, entry.name);
       const isGroup = entry.name.startsWith("(") && entry.name.endsWith(")");
       const isDynamic = entry.name.startsWith("[") && entry.name.endsWith("]");
       const nextUrl = isGroup || isDynamic ? urlSegments : [...urlSegments, entry.name];
       const nextPattern = isGroup ? pattern : [...pattern, isDynamic ? DYNAMIC : entry.name];
       if (isDynamic) {
-        const hasPage = ["tsx", "jsx", "ts", "js"].some((ext2) => existsSync(path10.join(full, `page.${ext2}`)));
-        if (hasPage) {
+        if (hasPageFile(full)) {
           found.push({ dir: full, path: `/${nextPattern.join("/")}`, parent: `/${urlSegments.join("/")}` });
         }
       }
@@ -27493,7 +27451,7 @@ async function runOg(options) {
       errors: [{ code: "chrome_missing", message: "No Chrome or Chromium binary found", fix: "Install Chrome, or set SONOR_CHROME_PATH to its path." }]
     };
   }
-  let config2 = await loadConfig4(cwd);
+  let config2 = await loadConfig2(cwd);
   let seeded = false;
   if (!config2) {
     config2 = await seedConfig(cwd);
@@ -27501,7 +27459,7 @@ async function runOg(options) {
     console.log(source_default.yellow("  ! No og.config.ts \u2014 generating a seed card from Sonor brand data."));
     console.log(source_default.gray("    The site owns its theme: add og.config.ts (defineOgCard) with the real palette."));
   }
-  const outPath = path10.resolve(cwd, options.out || "public/og.png");
+  const outPath = path12.resolve(cwd, options.out || "public/og.png");
   let clean = true;
   let cardKeyFix = null;
   let pageCardsWritten = 0;
@@ -27511,8 +27469,8 @@ async function runOg(options) {
     const report = await renderCard(config2, outPath, cwd, chrome, "site");
     spinner.stop();
     console.log(source_default.bold(`  Site card${seeded ? source_default.gray(" (seed)") : ""}`));
-    clean = reportCard(`${path10.relative(cwd, outPath)} \u2014 1200x630`, report) && clean;
-    checks.push(cardCheck("site card", path10.relative(cwd, outPath), report));
+    clean = reportCard(`${path12.relative(cwd, outPath)} \u2014 1200x630`, report) && clean;
+    checks.push(cardCheck("site card", path12.relative(cwd, outPath), report));
   } catch (err) {
     const message = err instanceof Error ? err.message.split("\n")[0] : String(err);
     spinner.fail(`Render failed: ${message}`);
@@ -27571,20 +27529,30 @@ async function runOg(options) {
           });
           cardKeyFix = CARD_KEY_FIX;
         }
-        const reports = await pooled(targets, RENDER_CONCURRENCY, async (route, i) => {
+        const placed = targets.map((route) => ({ ...route, dir: route.dir ?? routeOutputDir(appDir, route.path) }));
+        const toRender = placed.filter((route) => !codeOgImageFile(route.dir));
+        for (const route of placed.filter((r) => codeOgImageFile(r.dir))) {
+          for (const ext2 of ["png", "jpg", "jpeg"]) {
+            await fs3.rm(path12.join(route.dir, `opengraph-image.${ext2}`), { force: true });
+          }
+          const file = path12.relative(cwd, codeOgImageFile(route.dir));
+          console.log(source_default.gray(`    \u21B7 ${route.path}  keeps its own ${file}`));
+          checks.push({ id: "og.code-card", title: route.path, level: "ok", message: `Code-based card kept: ${file}` });
+        }
+        const reports = await pooled(toRender, RENDER_CONCURRENCY, async (route, i) => {
           const pageConfig = pageCardConfig(config2, route, brand);
-          const dir = route.dir ?? routeOutputDir(appDir, route.path);
+          const dir = route.dir;
           for (const ext2 of ["png", "jpg", "jpeg"]) {
-            await fs3.rm(path10.join(dir, `opengraph-image.${ext2}`), { force: true });
+            await fs3.rm(path12.join(dir, `opengraph-image.${ext2}`), { force: true });
           }
-          const png = path10.join(dir, "opengraph-image.png");
+          const png = path12.join(dir, "opengraph-image.png");
           const report = await renderCard(pageConfig, png, cwd, chrome, `page-${i}`);
           const file = await compressCard(png, cwd);
           return { route, file, report };
         });
         for (const { route, file, report } of reports) {
-          clean = reportCard(`${route.path}  ${source_default.gray(path10.relative(cwd, file))}`, report) && clean;
-          checks.push(cardCheck(route.path, path10.relative(cwd, file), report));
+          clean = reportCard(`${route.path}  ${source_default.gray(path12.relative(cwd, file))}`, report) && clean;
+          checks.push(cardCheck(route.path, path12.relative(cwd, file), report));
         }
         pageCardsWritten = reports.length;
         const bytes = await totalBytes(reports.map((r) => r.file));
@@ -27595,13 +27563,13 @@ async function runOg(options) {
   }
   if (options.preview !== false) {
     try {
-      const require_ = (await import('module')).createRequire(path10.join(cwd, "package.json"));
+      const require_ = (await import('module')).createRequire(path12.join(cwd, "package.json"));
       const sharp = require_("sharp");
-      const previewPath = path10.join(cwd, ".sonor", "og-preview.png");
-      await fs3.mkdir(path10.dirname(previewPath), { recursive: true });
+      const previewPath = path12.join(cwd, ".sonor", "og-preview.png");
+      await fs3.mkdir(path12.dirname(previewPath), { recursive: true });
       await sharp(outPath).resize(300).toFile(previewPath);
       console.log("");
-      console.log(source_default.gray(`  Thumbnail check: ${path10.relative(cwd, previewPath)} \u2014 if text is mush there, fix the card.`));
+      console.log(source_default.gray(`  Thumbnail check: ${path12.relative(cwd, previewPath)} \u2014 if text is mush there, fix the card.`));
     } catch {
       console.log(source_default.gray("  (sharp not resolvable \u2014 skipped the 300px preview)"));
     }
@@ -27660,15 +27628,15 @@ function routeOutputDir(appDir, urlPath) {
   const segments = urlPath.split("/").filter(Boolean);
   let dir = appDir;
   for (const segment of segments) {
-    const direct = path10.join(dir, segment);
+    const direct = path12.join(dir, segment);
     if (existsSync(direct)) {
       dir = direct;
       continue;
     }
     const group = existsSync(dir) ? readdirSync(dir, { withFileTypes: true }).find(
-      (e) => e.isDirectory() && e.name.startsWith("(") && e.name.endsWith(")") && existsSync(path10.join(dir, e.name, segment))
+      (e) => e.isDirectory() && e.name.startsWith("(") && e.name.endsWith(")") && existsSync(path12.join(dir, e.name, segment))
     ) : void 0;
-    dir = group ? path10.join(dir, group.name, segment) : direct;
+    dir = group ? path12.join(dir, group.name, segment) : direct;
   }
   return dir;
 }
@@ -27683,7 +27651,7 @@ async function totalBytes(files) {
   return total;
 }
 async function siteDomain(cwd) {
-  const envFile = path10.join(cwd, ".env.local");
+  const envFile = path12.join(cwd, ".env.local");
   if (existsSync(envFile)) {
     const env3 = await fs3.readFile(envFile, "utf-8").catch(() => "");
     const url = env3.match(/^NEXT_PUBLIC_SITE_URL=(.+)$/m)?.[1]?.trim();
@@ -27808,14 +27776,14 @@ var hs = new RegExp(pe, "g");
 var as = /\\\\/g;
 var ls = /\\{/g;
 var cs = /\\}/g;
-var fs20 = /\\,/g;
+var fs22 = /\\,/g;
 var us = /\\./g;
 var ds = 1e5;
 function Ht(n5) {
   return isNaN(n5) ? n5.charCodeAt(0) : parseInt(n5, 10);
 }
 function ps(n5) {
-  return n5.replace(as, fe).replace(ls, ue).replace(cs, qt).replace(fs20, de).replace(us, pe);
+  return n5.replace(as, fe).replace(ls, ue).replace(cs, qt).replace(fs22, de).replace(us, pe);
 }
 function ms(n5) {
   return n5.replace(is, "\\").replace(rs, "{").replace(ns, "}").replace(os5, ",").replace(hs, ".");
@@ -30847,10 +30815,10 @@ function unifiedDiff(before, after, filePath, context = 2) {
   return lines.join("\n");
 }
 function ext(filePath) {
-  return path10.extname(filePath).toLowerCase();
+  return path12.extname(filePath).toLowerCase();
 }
 function basename(filePath) {
-  return path10.basename(filePath).toLowerCase();
+  return path12.basename(filePath).toLowerCase();
 }
 var CODE_EXT = /* @__PURE__ */ new Set([".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"]);
 var TEXT_EXT = /* @__PURE__ */ new Set([...CODE_EXT, ".css", ".scss", ".json", ".md", ".mdx"]);
@@ -31004,7 +30972,7 @@ var IGNORE = [
 ];
 async function listFiles(cwd, onlyPath) {
   if (onlyPath) {
-    const rel = path10.isAbsolute(onlyPath) ? path10.relative(cwd, onlyPath) : onlyPath;
+    const rel = path12.isAbsolute(onlyPath) ? path12.relative(cwd, onlyPath) : onlyPath;
     return [rel];
   }
   const matches = await Ze(SCAN_PATTERNS, { cwd, ignore: IGNORE, dot: true, nodir: true });
@@ -31016,7 +30984,7 @@ async function runCodemod(options) {
   const files = await listFiles(cwd, onlyPath);
   const changes = [];
   for (const rel of files) {
-    const full = path10.join(cwd, rel);
+    const full = path12.join(cwd, rel);
     let source;
     try {
       source = await fs3.readFile(full, "utf-8");
@@ -31165,9 +31133,9 @@ function findManifestPath() {
   const baseDir = typeof __dirname !== "undefined" ? __dirname : process.cwd();
   let dir = baseDir;
   for (let i = 0; i < 8; i++) {
-    const candidate = path10.join(dir, "agent-manifest.json");
+    const candidate = path12.join(dir, "agent-manifest.json");
     if (fs__default.existsSync(candidate)) return candidate;
-    const parent = path10.dirname(dir);
+    const parent = path12.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -31246,7 +31214,7 @@ async function syncCommand2(options) {
 }
 async function syncPagesToPortal(apiUrl, apiKey, dryRun) {
   const spinner = ora("Discovering pages...").start();
-  const appDir = findAppDir();
+  const appDir = findAppDirForDiscovery();
   if (!appDir) {
     spinner.fail("Could not find app directory");
     return;
@@ -31307,20 +31275,8 @@ async function syncPagesToPortal(apiUrl, apiKey, dryRun) {
     syncSpinner.fail(`Sync failed: ${error2.message}`);
   }
 }
-function findAppDir() {
-  const candidates = [
-    path10.join(process.cwd(), "app"),
-    path10.join(process.cwd(), "src", "app")
-  ];
-  for (const candidate of candidates) {
-    if (existsSync(candidate)) {
-      return candidate;
-    }
-  }
-  return null;
-}
 function discoverPages(appDir, currentPath = "", pages = []) {
-  const fullPath = path10.join(appDir, currentPath);
+  const fullPath = path12.join(appDir, currentPath);
   if (!existsSync(fullPath)) {
     return pages;
   }
@@ -31342,7 +31298,7 @@ function discoverPages(appDir, currentPath = "", pages = []) {
     });
   }
   for (const entry of entries) {
-    const entryPath = path10.join(fullPath, entry);
+    const entryPath = path12.join(fullPath, entry);
     const stat = statSync(entryPath);
     if (stat.isDirectory()) {
       const folderName = entry.toLowerCase();
@@ -31355,21 +31311,21 @@ function discoverPages(appDir, currentPath = "", pages = []) {
       if (entry.startsWith("_")) {
         continue;
       }
-      discoverPages(appDir, path10.join(currentPath, entry), pages);
+      discoverPages(appDir, path12.join(currentPath, entry), pages);
     }
   }
   return pages;
 }
 function findNextBuildDir() {
   const cwd = process.cwd();
-  const candidate = path10.join(cwd, ".next", "server", "app");
+  const candidate = path12.join(cwd, ".next", "server", "app");
   return existsSync(candidate) ? candidate : null;
 }
 function extractPageContent(buildDir, pagePath) {
   const baseName = pagePath === "/" ? "index" : pagePath.replace(/^\//, "");
   const htmlCandidates = [
-    path10.join(buildDir, `${baseName}.html`),
-    path10.join(buildDir, baseName, "index.html")
+    path12.join(buildDir, `${baseName}.html`),
+    path12.join(buildDir, baseName, "index.html")
   ];
   let html = null;
   for (const candidate of htmlCandidates) {
@@ -31383,8 +31339,8 @@ function extractPageContent(buildDir, pagePath) {
     }
   }
   const rscCandidates = [
-    path10.join(buildDir, `${baseName}.rsc`),
-    path10.join(buildDir, baseName, "index.rsc")
+    path12.join(buildDir, `${baseName}.rsc`),
+    path12.join(buildDir, baseName, "index.rsc")
   ];
   let rsc = null;
   for (const candidate of rscCandidates) {
@@ -31495,7 +31451,7 @@ var BLOG_EXTENSIONS = [".mdx", ".md"];
 function findBlogDir() {
   const cwd = process.cwd();
   for (const dir of BLOG_DIRS) {
-    const full = path10.join(cwd, dir);
+    const full = path12.join(cwd, dir);
     if (existsSync(full)) return full;
   }
   return null;
@@ -31505,7 +31461,7 @@ async function discoverBlogPosts(dir) {
   async function walk(currentDir) {
     const entries = readdirSync(currentDir);
     for (const entry of entries) {
-      const fullPath = path10.join(currentDir, entry);
+      const fullPath = path12.join(currentDir, entry);
       const stat = statSync(fullPath);
       if (stat.isDirectory()) {
         await walk(fullPath);
@@ -31522,7 +31478,7 @@ async function discoverBlogPosts(dir) {
         date: frontmatter.date,
         tags: frontmatter.tags,
         author: frontmatter.author,
-        filePath: path10.relative(process.cwd(), fullPath)
+        filePath: path12.relative(process.cwd(), fullPath)
       });
     }
   }
@@ -31555,7 +31511,7 @@ async function syncBlogToPortal(_apiUrl, _apiKey, _dryRun) {
   }
   const spinner = ora("Discovering blog posts...").start();
   const posts = await discoverBlogPosts(blogDir);
-  spinner.succeed(`Found ${posts.length} local markdown post(s) in ${path10.relative(process.cwd(), blogDir)}`);
+  spinner.succeed(`Found ${posts.length} local markdown post(s) in ${path12.relative(process.cwd(), blogDir)}`);
   if (posts.length === 0) return;
   for (const post of posts.slice(0, 10)) {
     console.log(source_default.gray(`    ${post.slug}: ${post.title || "(no title)"}`));
@@ -31572,11 +31528,11 @@ async function discoverSchemaUsage(appDir) {
   async function walk(currentDir, currentPath = "") {
     const entries = readdirSync(currentDir);
     for (const entry of entries) {
-      const fullPath = path10.join(currentDir, entry);
+      const fullPath = path12.join(currentDir, entry);
       const stat = statSync(fullPath);
       if (stat.isDirectory()) {
         if (entry.startsWith(".") || entry === "node_modules") continue;
-        await walk(fullPath, path10.join(currentPath, entry));
+        await walk(fullPath, path12.join(currentPath, entry));
         continue;
       }
       if (!/\.(tsx?|jsx?)$/.test(entry)) continue;
@@ -31590,7 +31546,7 @@ async function discoverSchemaUsage(appDir) {
               pagePath: pathMatch[1],
               schemaTypes: ["managed"],
               source: "ManagedSchema",
-              filePath: path10.relative(process.cwd(), fullPath)
+              filePath: path12.relative(process.cwd(), fullPath)
             });
           }
         }
@@ -31608,7 +31564,7 @@ async function discoverSchemaUsage(appDir) {
             pagePath,
             schemaTypes: [...new Set(types)],
             source: "json-ld",
-            filePath: path10.relative(process.cwd(), fullPath)
+            filePath: path12.relative(process.cwd(), fullPath)
           });
         }
       }
@@ -31618,7 +31574,7 @@ async function discoverSchemaUsage(appDir) {
   return usages;
 }
 async function syncSchemasToPortal(apiUrl, apiKey, dryRun) {
-  const appDir = findAppDir();
+  const appDir = findAppDirForDiscovery();
   if (!appDir) {
     console.log(source_default.gray("  No app directory found"));
     return;
@@ -31661,15 +31617,15 @@ async function apiRoutesCommand(options) {
   console.log("");
   console.log(source_default.bold("  Site-Kit API Routes"));
   console.log("");
-  const appDir = findAppDir2();
+  const appDir = findAppDirForDiscovery();
   if (!appDir) {
     console.log(source_default.red("  \u2717 Could not find app directory"));
     console.log(source_default.gray("    Make sure you are in a Next.js project with an app directory"));
     console.log("");
     process.exit(1);
   }
-  const routeDir = path10.join(appDir, "_uptrade", "api", "[...path]");
-  const routeFile = path10.join(routeDir, "route.ts");
+  const routeDir = path12.join(appDir, "_uptrade", "api", "[...path]");
+  const routeFile = path12.join(routeDir, "route.ts");
   if (existsSync(routeFile) && !options.force) {
     console.log(source_default.yellow("  \u26A0 API routes already exist"));
     console.log(source_default.gray(`    ${routeFile}`));
@@ -31704,18 +31660,6 @@ async function apiRoutesCommand(options) {
     spinner.fail(`Failed to create API routes: ${error2.message}`);
   }
 }
-function findAppDir2() {
-  const candidates = [
-    path10.join(process.cwd(), "app"),
-    path10.join(process.cwd(), "src", "app")
-  ];
-  for (const candidate of candidates) {
-    if (existsSync(candidate)) {
-      return candidate;
-    }
-  }
-  return null;
-}
 function generateRouteHandler() {
   return `/**
  * Sonor API Proxy
@@ -31820,12 +31764,12 @@ async function handleRequest(
 `;
 }
 function detectPackageManager(cwd) {
-  if (existsSync(path10.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
-  if (existsSync(path10.join(cwd, "yarn.lock"))) return "yarn";
+  if (existsSync(path12.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
+  if (existsSync(path12.join(cwd, "yarn.lock"))) return "yarn";
   return "npm";
 }
 async function run6(ctx, options) {
-  if (!existsSync(path10.join(ctx.cwd, "package.json"))) {
+  if (!existsSync(path12.join(ctx.cwd, "package.json"))) {
     throw new UsageError(
       "NO_PACKAGE_JSON",
       "No package.json found",
@@ -31870,12 +31814,12 @@ async function installCommand(options) {
   await runCommand(ctx, (c) => run6(c, options), renderHuman4);
 }
 function detectPackageManager2(cwd) {
-  if (existsSync(path10.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
-  if (existsSync(path10.join(cwd, "yarn.lock"))) return "yarn";
+  if (existsSync(path12.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
+  if (existsSync(path12.join(cwd, "yarn.lock"))) return "yarn";
   return "npm";
 }
 async function run7(ctx, options) {
-  const pkgPath = path10.join(ctx.cwd, "package.json");
+  const pkgPath = path12.join(ctx.cwd, "package.json");
   if (!existsSync(pkgPath)) {
     throw new UsageError("NO_PACKAGE_JSON", "No package.json found", "Run this from your project root.");
   }
@@ -31930,21 +31874,21 @@ async function scaffoldCommand(options) {
   );
   console.log("");
   const cwd = process.cwd();
-  const appDir = await findAppDir3();
+  const appDir = findAppDirForDiscovery(cwd);
   if (!appDir) {
     console.log(source_default.red("  \u2717 No app directory found (app/ or src/app/)"));
     process.exit(1);
   }
   const files = [
     {
-      path: path10.join(appDir, "sitemap.ts"),
+      path: path12.join(appDir, "sitemap.ts"),
       label: "Sitemap",
       content: `import { createSitemap } from '@sonordev/site-kit/sitemap'
 
 export default createSitemap({
   // baseUrl auto-resolved from Portal via API key
-  includeLlmsTxtInSitemap: true,
-  includeLlmsFullTxtInSitemap: true,
+  // llms.txt stays out of the sitemap on purpose: it's a plain-text duplicate
+  // of these pages, and AI crawlers find it at /llms.txt anyway.
   // optimizedLLMsTxt: true, // optional: static build writes optimized llms (CI)
   // llmsPublicSummaryOnly: true, // optional: page list from Portal public summaries only
   // additionalPaths: async () => [...],
@@ -31952,7 +31896,7 @@ export default createSitemap({
 `
     },
     {
-      path: path10.join(appDir, "robots.txt", "route.ts"),
+      path: path12.join(appDir, "robots.txt", "route.ts"),
       label: "Robots.txt",
       content: `import { createRobots } from '@sonordev/site-kit/robots'
 
@@ -31960,7 +31904,7 @@ export const GET = createRobots({})
 `
     },
     {
-      path: path10.join(appDir, "llms.txt", "route.ts"),
+      path: path12.join(appDir, "llms.txt", "route.ts"),
       label: "llms.txt",
       content: `import { createLLMsTxtHandler } from '@sonordev/site-kit/llms'
 
@@ -31968,7 +31912,7 @@ export const GET = createLLMsTxtHandler({ preferStatic: true })
 `
     },
     {
-      path: path10.join(appDir, "llms-full.txt", "route.ts"),
+      path: path12.join(appDir, "llms-full.txt", "route.ts"),
       label: "llms-full.txt",
       content: `import { createLLMsFullTxtHandler } from '@sonordev/site-kit/llms'
 
@@ -31979,14 +31923,14 @@ export const GET = createLLMsFullTxtHandler({ preferStatic: true })
   if (!options.minimal) {
     files.push(
       {
-        path: path10.join(cwd, "proxy.ts"),
-        label: "Proxy (security headers; redirects resolve at the 404 boundary)",
+        path: path12.join(cwd, "proxy.ts"),
+        label: "Proxy (security headers, managed redirects)",
         content: `import { createProxy } from '@sonordev/site-kit/proxy'
 
-// redirects: false \u2014 managed redirects resolve in app/not-found.tsx via
-// resolveManagedRedirect() instead of on every request. The proxy still
-// stamps x-sk-path so the 404 boundary knows the requested URL.
-export default createProxy({ redirects: false })
+// Sonor-managed redirects apply here. The rule list is cached in memory for
+// five minutes, so page loads rarely wait on it. Don't move them into
+// app/not-found.tsx: reading request headers there makes every page dynamic.
+export default createProxy({ redirects: true })
 
 // Inlined on purpose: Next statically parses \`config.matcher\` at build time
 // and rejects an imported value (Turbopack build error). Keep in sync with
@@ -31999,7 +31943,7 @@ export const config = {
 `
       },
       {
-        path: path10.join(appDir, "manifest.webmanifest", "route.ts"),
+        path: path12.join(appDir, "manifest.webmanifest", "route.ts"),
         label: "PWA Manifest",
         content: `import { createManifest } from '@sonordev/site-kit/manifest'
 
@@ -32007,19 +31951,12 @@ export const GET = createManifest()
 `
       },
       {
-        path: path10.join(appDir, "not-found.tsx"),
-        label: "404 Page (resolves managed redirects)",
-        content: `import { redirect, permanentRedirect } from 'next/navigation'
-import { resolveManagedRedirect } from '@sonordev/site-kit/redirects/not-found'
-
-export default async function NotFound() {
-  // Sonor-managed redirects resolve here, at the only place they can matter:
-  // a URL that would otherwise 404. Successful page loads pay nothing.
-  const managed = await resolveManagedRedirect()
-  if (managed) {
-    ;(managed.permanent ? permanentRedirect : redirect)(managed.destination)
-  }
-
+        path: path12.join(appDir, "not-found.tsx"),
+        label: "404 Page",
+        content: `// Keep this component free of request APIs (headers, cookies). Next
+// renders the root 404 inside every page, so one headers() call here makes
+// the whole site dynamic. Managed redirects run in proxy.ts instead.
+export default function NotFound() {
   return (
     <div style={{ textAlign: 'center', padding: '4rem 1rem' }}>
       <h1 style={{ fontSize: '3rem', fontWeight: 700, marginBottom: '0.5rem' }}>404</h1>
@@ -32047,7 +31984,7 @@ export default async function NotFound() {
 `
       },
       {
-        path: path10.join(appDir, "error.tsx"),
+        path: path12.join(appDir, "error.tsx"),
         label: "Error Boundary",
         content: `'use client'
 
@@ -32087,7 +32024,7 @@ export default function Error({
 `
       },
       {
-        path: path10.join(cwd, "og.config.ts"),
+        path: path12.join(cwd, "og.config.ts"),
         label: "OG card config (run: sonor-setup og)",
         content: `import { defineOgCard } from '@sonordev/site-kit/og'
 
@@ -32116,7 +32053,7 @@ export default defineOgCard({
         // .env.local, not .env.example: one real env file per project. The
         // deployer copies these values into the host's env settings. Skipped
         // when the file already exists, so real keys are never touched.
-        path: path10.join(cwd, ".env.local"),
+        path: path12.join(cwd, ".env.local"),
         label: ".env.local",
         content: `# ===================================
 # @sonordev/site-kit \u2014 Environment Variables
@@ -32138,10 +32075,10 @@ SONOR_API_KEY=sonor_your-project-uuid_your-secret-key
   if (options.dryRun) {
     console.log(source_default.yellow("  [DRY RUN] Would create:"));
     for (const f of files) {
-      const rel = path10.relative(cwd, f.path);
-      const exists = existsSync(f.path);
+      const rel = path12.relative(cwd, f.path);
+      const exists2 = existsSync(f.path);
       console.log(
-        source_default.gray(`    ${rel}`) + (exists ? source_default.yellow(" (exists, would skip)") : "")
+        source_default.gray(`    ${rel}`) + (exists2 ? source_default.yellow(" (exists, would skip)") : "")
       );
     }
     console.log("");
@@ -32153,13 +32090,13 @@ SONOR_API_KEY=sonor_your-project-uuid_your-secret-key
   for (const f of files) {
     try {
       if (existsSync(f.path) && !options.force) {
-        spinner.warn(`Skipped (exists): ${path10.relative(cwd, f.path)}`);
+        spinner.warn(`Skipped (exists): ${path12.relative(cwd, f.path)}`);
         skipped++;
         continue;
       }
-      await fs3.mkdir(path10.dirname(f.path), { recursive: true });
+      await fs3.mkdir(path12.dirname(f.path), { recursive: true });
       await fs3.writeFile(f.path, f.content, "utf-8");
-      spinner.succeed(`${f.label}: ${path10.relative(cwd, f.path)}`);
+      spinner.succeed(`${f.label}: ${path12.relative(cwd, f.path)}`);
       created++;
     } catch (err) {
       spinner.fail(`Failed: ${f.path}`);
@@ -32205,17 +32142,209 @@ SONOR_API_KEY=sonor_your-project-uuid_your-secret-key
     console.log("");
   }
 }
-async function findAppDir3() {
-  const cwd = process.cwd();
-  const candidates = [
-    path10.join(cwd, "app"),
-    path10.join(cwd, "src", "app")
-  ];
-  for (const dir of candidates) {
-    if (existsSync(dir)) return dir;
+var LLMS_FILES = [
+  { path: "/llms.txt", handler: "createLLMsTxtHandler" },
+  { path: "/llms-full.txt", handler: "createLLMsFullTxtHandler" }
+];
+var NEXT_CONFIGS = ["next.config.ts", "next.config.mts", "next.config.mjs", "next.config.js", "next.config.cjs"];
+function read(cwd, rel) {
+  try {
+    return fs__default.readFileSync(path12.join(cwd, rel), "utf-8");
+  } catch {
+    return "";
+  }
+}
+function exists(cwd, rel) {
+  try {
+    return fs__default.existsSync(path12.join(cwd, rel));
+  } catch {
+    return false;
+  }
+}
+function patternMatches(pattern, urlPath) {
+  const re2 = pattern.trim().split(/\(\.\*\)|:\w+\*|\*/).map((part) => part.replace(/[.+?^${}()|[\]\\]/g, "\\$&")).join(".*");
+  return new RegExp(`^${re2}$`).test(urlPath);
+}
+var NOINDEX = /noindex/i;
+function netlifyTomlNoindex(toml, urlPath) {
+  const blocks = [];
+  for (const line of toml.split("\n")) {
+    const header = line.match(/^\s*\[\[?\s*([^\]]+?)\s*\]\]?\s*$/);
+    if (header && header[1] !== "headers.values") blocks.push(line);
+    else if (blocks.length) blocks[blocks.length - 1] += `
+${line}`;
+  }
+  return blocks.some((block) => {
+    if (!/^\s*\[\[\s*headers\s*\]\]/.test(block)) return false;
+    const pattern = block.match(/^\s*for\s*=\s*["']([^"']+)["']/m)?.[1];
+    const value = block.match(/^\s*["']?X-Robots-Tag["']?\s*=\s*["']([^"']*)["']/im)?.[1];
+    return !!pattern && !!value && NOINDEX.test(value) && patternMatches(pattern, urlPath);
+  });
+}
+function headersFileNoindex(text, urlPath) {
+  let current = null;
+  for (const line of text.split("\n")) {
+    if (!line.trim() || line.trim().startsWith("#")) continue;
+    if (!/^\s/.test(line)) {
+      current = line.trim();
+      continue;
+    }
+    const m = line.match(/^\s+X-Robots-Tag\s*:\s*(.+)$/i);
+    if (current && m && NOINDEX.test(m[1]) && patternMatches(current, urlPath)) return true;
+  }
+  return false;
+}
+function vercelJsonNoindex(text, urlPath) {
+  try {
+    const json = JSON.parse(text);
+    return (json.headers ?? []).some(
+      (rule) => !!rule.source && patternMatches(rule.source, urlPath) && (rule.headers ?? []).some((h) => /^x-robots-tag$/i.test(h.key ?? "") && NOINDEX.test(h.value ?? ""))
+    );
+  } catch {
+    return false;
+  }
+}
+function findHostNoindex(cwd, urlPath) {
+  const toml = read(cwd, "netlify.toml");
+  if (toml && netlifyTomlNoindex(toml, urlPath)) return "netlify.toml";
+  const headers = read(cwd, "public/_headers");
+  if (headers && headersFileNoindex(headers, urlPath)) return "public/_headers";
+  const vercel = read(cwd, "vercel.json");
+  if (vercel && vercelJsonNoindex(vercel, urlPath)) return "vercel.json";
+  return null;
+}
+var LINK_DISCOVERY_LINE = /^.*\bLink\b.*(llms[^\n]*describedby|describedby[^\n]*llms).*$/im;
+function findDiscoverySource(cwd) {
+  for (const rel of findProxyFiles(cwd)) {
+    const src = read(cwd, rel);
+    const viaFactory = /\bcreate(Proxy|Middleware)\s*\(/.test(src) && /\bllmsDiscovery\b(?!\s*:\s*false\b)/.test(src);
+    if (viaFactory) return `${rel} (createProxy llmsDiscovery)`;
+    if (src.includes("buildAiDiscoveryHeaders")) return `${rel} (buildAiDiscoveryHeaders)`;
+  }
+  for (const rel of NEXT_CONFIGS) {
+    const src = read(cwd, rel);
+    if (!src) continue;
+    if (/\bllmsTxtDiscoveryLink\s*:(?!\s*false\b)/.test(src)) return `${rel} (llmsTxtDiscoveryLink)`;
+    if (src.includes("buildAiDiscoveryHeaders")) return `${rel} (buildAiDiscoveryHeaders)`;
+    break;
+  }
+  const layout = findRootLayout(cwd);
+  if (layout) {
+    const src = read(cwd, path12.relative(cwd, layout));
+    if (src.includes("buildAiDiscoveryHeaders") || src.includes("llmsTxtDiscoveryLink")) {
+      return path12.relative(cwd, layout);
+    }
+  }
+  for (const rel of ["netlify.toml", "public/_headers"]) {
+    if (LINK_DISCOVERY_LINE.test(read(cwd, rel))) return rel;
   }
   return null;
 }
+function readGeoWiring(cwd) {
+  const appDir = NEXT_APP_DIRS.find((rel) => exists(cwd, rel)) ?? null;
+  const sitemap = findSitemapRoute(cwd);
+  const sitemapSrc = sitemap ? read(cwd, sitemap) : "";
+  const sitemapListsLlms = /\bincludeLlms(Full)?TxtInSitemap\s*:\s*true\b/.test(sitemapSrc) || /['"`/]llms(-full)?\.txt['"`]/.test(sitemapSrc);
+  const sitemapWritesStatic = /\bcreateSitemap\s*\(/.test(sitemapSrc);
+  const writesLlms = sitemapWritesStatic && !/\boptimizedLLMsTxt\s*:\s*false\b/.test(sitemapSrc);
+  const writesLlmsFull = writesLlms && /\boptimizedLLMsFullTxt\s*:\s*true\b/.test(sitemapSrc);
+  const llms = LLMS_FILES.map(({ path: urlPath, handler }) => {
+    const file = urlPath.slice(1);
+    const routeAbs = appDir ? findConventionFile(path12.join(cwd, appDir, file), "route") : null;
+    const route = routeAbs ? path12.relative(cwd, routeAbs) : null;
+    const routeSrc = route ? read(cwd, route) : "";
+    const publicFile = exists(cwd, path12.join("public", file));
+    const built = urlPath === "/llms.txt" ? writesLlms : writesLlmsFull;
+    return {
+      path: urlPath,
+      route,
+      routeUsesKitHandler: routeSrc.includes(handler),
+      routeOptsOutOfNoindex: /\bnoindex\s*:\s*false\b/.test(routeSrc),
+      routeSetsNoindex: /X-Robots-Tag/i.test(routeSrc) && NOINDEX.test(routeSrc),
+      servedStatic: publicFile || built,
+      staticReason: publicFile ? `public/${file}` : built ? `public/${file} (written by createSitemap at build)` : null,
+      hostNoindex: findHostNoindex(cwd, urlPath)
+    };
+  });
+  return { appDir, llms, sitemap, sitemapListsLlms, discovery: findDiscoverySource(cwd) };
+}
+var DISCOVERY_FIX = "Add llmsDiscovery to the proxy: createProxy({ llmsDiscovery: { siteUrl } }) in proxy.ts. Or withSiteKitConfig({ llmsTxtDiscoveryLink: true }) in next.config.";
+var SITEMAP_FIX = "Drop includeLlmsTxtInSitemap / includeLlmsFullTxtInSitemap (and any hand-added /llms*.txt entry) from the sitemap. A sitemap lists indexable HTML pages; AI crawlers find llms.txt at /llms.txt.";
+function hostNoindexFix(urlPath) {
+  return `The CDN serves it before any route handler runs, so set the header in host config. netlify.toml: [[headers]] for = "${urlPath}" [headers.values] X-Robots-Tag = "noindex"`;
+}
+function judgeGeoWiring(facts) {
+  const rows = [];
+  for (const f of facts.llms) {
+    const name = f.path.slice(1);
+    const id = f.path === "/llms.txt" ? "llms" : "llms-full";
+    const served = !!f.route || f.servedStatic;
+    rows.push(
+      served ? { id: `${id}.served`, label: `${name} served`, level: "ok", detail: f.route ?? f.staticReason ?? void 0 } : {
+        id: `${id}.served`,
+        label: `${name} served`,
+        level: "fail",
+        detail: `no ${facts.appDir ?? "app"}/${name}/route.* and no public/${name}`,
+        fix: "Run: sonor-setup geo --ensure-routes"
+      }
+    );
+  }
+  if (!facts.sitemap) {
+    rows.push({ id: "geo.sitemap", label: "sitemap leaves llms files out", level: "info", detail: "no sitemap route to check" });
+  } else if (facts.sitemapListsLlms) {
+    rows.push({
+      id: "geo.sitemap",
+      label: "sitemap leaves llms files out",
+      level: "warn",
+      detail: `${facts.sitemap} lists /llms.txt, inviting search engines to index a thin plain-text duplicate`,
+      fix: SITEMAP_FIX
+    });
+  } else {
+    rows.push({ id: "geo.sitemap", label: "sitemap leaves llms files out", level: "ok", detail: facts.sitemap });
+  }
+  rows.push(
+    facts.discovery ? { id: "geo.discovery", label: 'discovery header (Link rel="describedby")', level: "ok", detail: facts.discovery } : {
+      id: "geo.discovery",
+      label: 'discovery header (Link rel="describedby")',
+      level: "fail",
+      detail: "not wired in proxy, next.config, root layout, or host config",
+      fix: DISCOVERY_FIX
+    }
+  );
+  for (const f of facts.llms) {
+    if (!f.route && !f.servedStatic) continue;
+    const name = f.path.slice(1);
+    const id = `${f.path === "/llms.txt" ? "llms" : "llms-full"}.noindex`;
+    const label = `${name} sends X-Robots-Tag: noindex`;
+    if (f.servedStatic) {
+      rows.push(
+        f.hostNoindex ? { id, label, level: "ok", detail: f.hostNoindex } : { id, label, level: "warn", detail: `${f.staticReason} is served without it`, fix: hostNoindexFix(f.path) }
+      );
+      continue;
+    }
+    if (f.hostNoindex) {
+      rows.push({ id, label, level: "ok", detail: f.hostNoindex });
+    } else if (f.routeUsesKitHandler && !f.routeOptsOutOfNoindex) {
+      rows.push({ id, label, level: "ok", detail: `${f.route} (site-kit handler default)` });
+    } else if (f.routeSetsNoindex) {
+      rows.push({ id, label, level: "ok", detail: f.route });
+    } else {
+      rows.push({
+        id,
+        label,
+        level: "warn",
+        detail: f.routeOptsOutOfNoindex ? `${f.route} passes noindex: false` : `${f.route} doesn't set it`,
+        fix: f.routeOptsOutOfNoindex ? "Drop noindex: false unless you want llms.txt in search results." : "Serve it with createLLMsTxtHandler (sends the header by default), or add X-Robots-Tag: noindex to the response."
+      });
+    }
+  }
+  return rows;
+}
+function checkGeoWiring(cwd) {
+  return judgeGeoWiring(readGeoWiring(cwd));
+}
+
+// src/cli/commands/geo.ts
 var LLMS_ROUTE = `import { createLLMsTxtHandler } from '@sonordev/site-kit/llms'
 
 export const GET = createLLMsTxtHandler({ preferStatic: true })
@@ -32224,40 +32353,36 @@ var LLMS_FULL_ROUTE = `import { createLLMsFullTxtHandler } from '@sonordev/site-
 
 export const GET = createLLMsFullTxtHandler({ preferStatic: true })
 `;
-async function readIfExists(p) {
-  if (!existsSync(p)) return "";
-  try {
-    return await fs3.readFile(p, "utf-8");
-  } catch {
-    return "";
-  }
-}
+var ICON = {
+  ok: source_default.green("  \u2713 "),
+  info: source_default.gray("  \xB7 "),
+  warn: source_default.yellow("  ! "),
+  fail: source_default.red("  \u2717 ")
+};
 async function ensureLlmsRouteFiles(appDir, dryRun) {
-  const llms = path10.join(appDir, "llms.txt", "route.ts");
-  const llmsFull = path10.join(appDir, "llms-full.txt", "route.ts");
   let n5 = 0;
   if (dryRun) return 0;
-  if (!existsSync(llms)) {
-    await fs3.mkdir(path10.dirname(llms), { recursive: true });
-    await fs3.writeFile(llms, LLMS_ROUTE, "utf-8");
-    n5++;
-  }
-  if (!existsSync(llmsFull)) {
-    await fs3.mkdir(path10.dirname(llmsFull), { recursive: true });
-    await fs3.writeFile(llmsFull, LLMS_FULL_ROUTE, "utf-8");
+  for (const [dir, source] of [
+    ["llms.txt", LLMS_ROUTE],
+    ["llms-full.txt", LLMS_FULL_ROUTE]
+  ]) {
+    if (findConventionFile(path12.join(appDir, dir), "route")) continue;
+    const file = path12.join(appDir, dir, "route.ts");
+    await fs3.mkdir(path12.dirname(file), { recursive: true });
+    await fs3.writeFile(file, source, "utf-8");
     n5++;
   }
   return n5;
 }
 async function geoCommand(options) {
   if (options.forInstall) {
-    const appDir2 = await findAppDir3();
+    const appDir2 = findAppDirForDiscovery();
     if (!appDir2) return;
     const created = await ensureLlmsRouteFiles(appDir2, options.dryRun);
     if (created > 0) {
       console.log(
         source_default.cyan(
-          `[@sonordev/site-kit] Created ${created} llms route file(s). Set NEXT_PUBLIC_SITE_URL, use createSitemap({ includeLlmsTxtInSitemap: true }), and withSiteKitConfig({ llmsTxtDiscoveryLink: true }) when ready.`
+          `[@sonordev/site-kit] Created ${created} llms route file(s). Set NEXT_PUBLIC_SITE_URL and add createProxy({ llmsDiscovery: { siteUrl } }) to proxy.ts when ready.`
         )
       );
     }
@@ -32272,59 +32397,20 @@ async function geoCommand(options) {
     )
   );
   console.log("");
-  const appDir = await findAppDir3();
+  const appDir = findAppDirForDiscovery();
   if (!appDir) {
     console.log(source_default.red("  \u2717 No app directory (app/ or src/app/)"));
     process.exit(1);
   }
-  const llms = path10.join(appDir, "llms.txt", "route.ts");
-  const llmsFull = path10.join(appDir, "llms-full.txt", "route.ts");
-  const sitemap = path10.join(appDir, "sitemap.ts");
   let allOk = true;
-  const row = (label, pass) => {
-    if (!pass) allOk = false;
-    console.log(
-      (pass ? source_default.green("  \u2713 ") : source_default.red("  \u2717 ")) + label
-    );
-  };
-  row("llms.txt route", existsSync(llms));
-  row("llms-full.txt route", existsSync(llmsFull));
-  let sitemapHasLlms = false;
-  if (existsSync(sitemap)) {
-    const txt = await readIfExists(sitemap);
-    sitemapHasLlms = txt.includes("includeLlmsTxtInSitemap") || txt.includes("includeLlmsFullTxtInSitemap");
-    row("sitemap.ts lists llms URLs", sitemapHasLlms);
-  } else {
-    row("sitemap.ts lists llms URLs", false);
-  }
-  const nextConfigs = [
-    path10.join(cwd, "next.config.ts"),
-    path10.join(cwd, "next.config.mjs"),
-    path10.join(cwd, "next.config.js")
-  ];
-  let nextCfg = "";
-  for (const p of nextConfigs) {
-    if (existsSync(p)) {
-      nextCfg = await readIfExists(p);
-      break;
+  for (const row of checkGeoWiring(cwd)) {
+    if (row.level === "fail") allOk = false;
+    const detail = row.detail ? source_default.gray(`  ${row.detail}`) : "";
+    console.log(`${ICON[row.level]}${row.label}${detail}`);
+    if (row.fix && (row.level === "fail" || row.level === "warn")) {
+      console.log(source_default.gray(`      ${row.fix}`));
     }
   }
-  const layoutCandidates = [
-    path10.join(appDir, "layout.tsx"),
-    path10.join(appDir, "layout.jsx"),
-    path10.join(appDir, "layout.js")
-  ];
-  let layoutTxt = "";
-  for (const p of layoutCandidates) {
-    layoutTxt = await readIfExists(p);
-    if (layoutTxt) break;
-  }
-  const hasLayoutDiscovery = layoutTxt.includes("buildAiDiscoveryHeaders") || layoutTxt.includes("llmsTxtDiscoveryLink");
-  const hasConfigDiscovery = nextCfg.includes("llmsTxtDiscoveryLink");
-  row(
-    "discovery header (next.config or root layout)",
-    hasConfigDiscovery || hasLayoutDiscovery
-  );
   const siteUrl = process.env.NEXT_PUBLIC_SITE_URL?.trim() || process.env.SITE_BASE_URL?.trim() || (process.env.VERCEL_URL?.trim() ? `https://${process.env.VERCEL_URL.replace(/\/$/, "")}` : "");
   if (siteUrl) {
     console.log(source_default.gray(`  Public origin (env): ${siteUrl}`));
@@ -32350,19 +32436,16 @@ async function geoCommand(options) {
   console.log(source_default.bold("  Automation"));
   console.log("");
   console.log(
-    source_default.gray(
-      "  \u2022 next.config: withSiteKitConfig({ llmsTxtDiscoveryLink: true })"
-    )
+    source_default.gray('  \u2022 proxy.ts: createProxy({ llmsDiscovery: { siteUrl } })  (Link rel="describedby")')
   );
   console.log(
-    source_default.gray(
-      "    (If you define your own headers() on nextConfig, merge Link manually.)"
-    )
+    source_default.gray("    or next.config: withSiteKitConfig({ llmsTxtDiscoveryLink: true })")
   );
   console.log(
-    source_default.gray(
-      "  \u2022 createSitemap({ includeLlmsTxtInSitemap: true, includeLlmsFullTxtInSitemap: true })"
-    )
+    source_default.gray("  \u2022 createLLMsTxtHandler sends X-Robots-Tag: noindex; a static public/llms.txt needs it in netlify.toml")
+  );
+  console.log(
+    source_default.gray("  \u2022 Keep llms.txt out of the sitemap: AI crawlers find it at /llms.txt")
   );
   console.log(
     source_default.gray("  \u2022 npx sonor-setup scaffold --minimal  (routes + sitemap template)")
@@ -32372,8 +32455,8 @@ async function geoCommand(options) {
 }
 
 // src/cli/index.ts
-(0, import_dotenv.config)({ path: ".env.local", quiet: true });
-(0, import_dotenv.config)({ path: ".env", quiet: true });
+(0, import_dotenv2.config)({ path: ".env.local", quiet: true });
+(0, import_dotenv2.config)({ path: ".env", quiet: true });
 var program2 = new Command();
 program2.name("sonor-setup").description("Setup + verification toolchain for @sonordev/site-kit").version(SITE_KIT_VERSION);
 withAgentFlags(