betterstart-cli 0.0.115 → 0.0.117

package/dist/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import {
   ACCEPT_TERMS_URL_PATTERN,
+  ADMIN_CONTAINER_ROUTE_GROUP,
   BETTERSTART_ASSET_HOST,
   BETTERSTART_DIR,
   CLI_PACKAGE_NAME,
@@ -85,7 +86,7 @@ import {
   trimDotSlash,
   usesIdentifier,
   validateAdminNamespace
-} from "./chunk-SG4U6EQY.js";
+} from "./chunk-FGEVDA53.js";
 
 // cli.ts
 import * as p66 from "@clack/prompts";
@@ -263,6 +264,14 @@ function redirectStdoutToStderr() {
     process.stdout.write = originalWrite;
   };
 }
+function writeMachineJson(payload) {
+  process.stdout.write(`${JSON.stringify(payload, null, 2)}
+`);
+}
+function writeDiagnostic(message) {
+  process.stderr.write(`${message}
+`);
+}
 function renderTableRows(rows) {
   const widths = [];
   for (const row of rows) {
@@ -531,7 +540,7 @@ function unique(values) {
   return Array.from(new Set(values));
 }
 function arraysEqual(a, b) {
-  return Boolean(a && a.length === b.length && a.every((value, index) => value === b[index]));
+  return Array.isArray(a) && a.length === b.length && a.every((value, index) => value === b[index]);
 }
 function isValidPort(port) {
   return Number.isInteger(port) && port > 0 && port <= 65535;
@@ -1125,25 +1134,41 @@ function flattenSlotLayout(slot) {
 
 // core-engine/schema/schema-reader/walk-slot-aware-field.ts
 function walkSlotAwareField(field, fieldPath, errors, options) {
+  if (!isRecord(field)) {
+    errors.push(`Field "${fieldPath}" must be an object.`);
+    return;
+  }
   options.checkField(field, fieldPath, errors);
+  const childPath = (parentPath, child) => `${parentPath}.${isRecord(child) && isNonEmptyString(child.name) ? child.name : "unnamed"}`;
   const descend = (children, parentPath) => {
+    if (!Array.isArray(children)) {
+      errors.push(`Field "${parentPath}" has a "fields" value that must be an array.`);
+      return;
+    }
     for (const child of children) {
-      walkSlotAwareField(child, `${parentPath}.${child.name ?? "unnamed"}`, errors, options);
+      walkSlotAwareField(child, childPath(parentPath, child), errors, options);
     }
   };
-  if (field.fields) {
+  if (field.fields !== void 0) {
     descend(field.fields, fieldPath);
   }
-  if (field.tabs) {
-    for (const tab of field.tabs) {
-      const tabPath = `${fieldPath}.${tab.name ?? "unnamed"}`;
-      options.onTab?.(tab, tabPath, errors);
-      if (options.descendTabSlots && tab.slot !== void 0) {
-        descend(flattenSlotLayout(tab.slot), tabPath);
-      }
-      if (tab.fields) {
-        descend(tab.fields, tabPath);
-      }
+  if (field.tabs === void 0) return;
+  if (!Array.isArray(field.tabs)) {
+    errors.push(`Field "${fieldPath}" has a "tabs" value that must be an array.`);
+    return;
+  }
+  for (const tab of field.tabs) {
+    const tabPath = childPath(fieldPath, tab);
+    if (!isRecord(tab)) {
+      errors.push(`Tab "${tabPath}" must be an object.`);
+      continue;
+    }
+    options.onTab?.(tab, tabPath, errors);
+    if (options.descendTabSlots && tab.slot !== void 0) {
+      descend(flattenSlotLayout(tab.slot), tabPath);
+    }
+    if (tab.fields !== void 0) {
+      descend(tab.fields, tabPath);
     }
   }
 }
@@ -1166,7 +1191,8 @@ function walkHeight(field, fieldPath, errors) {
 function collectInvalidHeightErrors(topLevelFields, rootPath, errors) {
   const prefix = rootPath ? `${rootPath}.` : "";
   for (const field of topLevelFields) {
-    walkHeight(field, `${prefix}${field.name ?? "unnamed"}`, errors);
+    const name = isRecord(field) && isNonEmptyString(field.name) ? field.name : "unnamed";
+    walkHeight(field, `${prefix}${name}`, errors);
   }
 }
 
@@ -1240,7 +1266,8 @@ function collectSlotAreaErrors(value, path113, errors) {
     return;
   }
   for (const field of fields) {
-    walkSlot(field, `${path113}.fields.${field.name ?? "unnamed"}`, errors);
+    const name = isRecord(field) && isNonEmptyString(field.name) ? field.name : "unnamed";
+    walkSlot(field, `${path113}.fields.${name}`, errors);
   }
 }
 
@@ -1297,7 +1324,8 @@ function walkSlot(field, fieldPath, errors) {
 function collectInvalidSlotErrors(fields, rootPath, errors) {
   const prefix = rootPath ? `${rootPath}.` : "";
   for (const field of fields) {
-    walkSlot(field, `${prefix}${field.name ?? "unnamed"}`, errors);
+    const name = isRecord(field) && isNonEmptyString(field.name) ? field.name : "unnamed";
+    walkSlot(field, `${prefix}${name}`, errors);
   }
 }
 
@@ -1914,6 +1942,7 @@ function resolveProjectPaths(config) {
   const namespace = resolveAdminNamespace(config.frameworkConfig.next.namespace);
   const adminDir = trimDotSlash(config.paths?.admin ?? "./admin");
   const pagesDir = trimDotSlash(config.paths?.pages ?? "./src/app/(admin)/admin/(authenticated)");
+  const containerDir = path6.posix.join(pagesDir, ADMIN_CONTAINER_ROUTE_GROUP);
   const schemasDir = trimDotSlash(config.paths?.schemas ?? "./admin/schemas");
   const adminDbDir = path6.posix.join(adminDir, "lib", "db");
   const adminDbCoreDir = path6.posix.join(adminDbDir, "core");
@@ -1927,6 +1956,7 @@ function resolveProjectPaths(config) {
   return {
     adminDir,
     pagesDir,
+    containerDir,
     schemasDir,
     adminDbDir,
     adminDbCoreDir,
@@ -2167,8 +2197,7 @@ function loadSchema(schemasDir, name) {
   const filePath = resolveSchemaFilePath(schemasDir, name);
   const content = fs10.readFileSync(filePath, "utf-8");
   const parsed = parseSchemaJson(content, filePath);
-  const obj = parsed;
-  switch (schemaKindFromType(name, obj.type)) {
+  switch (schemaKindFromType(name, isRecord(parsed) ? parsed.type : void 0)) {
     case "form":
       return { type: "form", schema: parsed, filePath };
     case "single":
@@ -2287,7 +2316,7 @@ function detectPackageManager(cwd) {
     if (!fs14.existsSync(pkgPath)) return void 0;
     try {
       const pkg = JSON.parse(fs14.readFileSync(pkgPath, "utf-8"));
-      if (typeof pkg.packageManager === "string") {
+      if (isRecord(pkg) && typeof pkg.packageManager === "string") {
         const name = pkg.packageManager.split("@")[0];
         if (name === "pnpm" || name === "npm" || name === "yarn" || name === "bun") return name;
       }
@@ -5931,7 +5960,7 @@ function formatTsValue(value, indent = 0) {
 ${value.map((item) => `${childIndent}${formatTsValue(item, indent + 2)}`).join(",\n")}
 ${currentIndent}]`;
   }
-  if (value && typeof value === "object") {
+  if (isRecord(value)) {
     return formatTsObject(value, indent);
   }
   return JSON.stringify(value);
@@ -9194,7 +9223,7 @@ function runFormPipeline(schema, cwd, config, options = {}) {
     },
     {
       name: "Admin pages",
-      run: () => generateFormAdminPages(schema, paths.pagesDir, namespacedOptions).files
+      run: () => generateFormAdminPages(schema, paths.containerDir, namespacedOptions).files
     },
     {
       name: "Navigation",
@@ -9237,11 +9266,13 @@ function genBarrelContent(files, ctx) {
     `${ctx.Singular}UpdateInput`,
     `${ctx.Singular}UpdateResult`,
     `${ctx.Singular}DeleteResult`,
-    ctx.hasCreatableSelectFields ? `${ctx.Singular}SelectOption` : null,
-    ctx.hasCreatableSelectFields ? `${ctx.Singular}SelectOptionFieldName` : null,
-    ctx.hasCreatableSelectFields ? `Create${ctx.Singular}SelectOptionInput` : null,
-    ctx.hasCreatableSelectFields ? `Create${ctx.Singular}SelectOptionResult` : null
-  ].filter(Boolean);
+    ...ctx.hasCreatableSelectFields ? [
+      `${ctx.Singular}SelectOption`,
+      `${ctx.Singular}SelectOptionFieldName`,
+      `Create${ctx.Singular}SelectOptionInput`,
+      `Create${ctx.Singular}SelectOptionResult`
+    ] : []
+  ];
   lines.push(`export type { ${typeNames.join(", ")} } from './types'`);
   lines.push("");
   for (const file of files) {
@@ -21762,37 +21793,37 @@ function runEntityPipeline(schema, cwd, config, options = {}) {
     },
     {
       name: "Column definitions",
-      run: () => generateColumns2(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generateColumns2(normalizedSchema, paths.containerDir, namespacedOptions).files
     },
     {
       name: "Table component",
-      run: () => generateTable2(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generateTable2(normalizedSchema, paths.containerDir, namespacedOptions).files
     },
     {
       name: "Page content",
-      run: () => generatePageContent2(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generatePageContent2(normalizedSchema, paths.containerDir, namespacedOptions).files
     },
     {
       name: "Page (server)",
-      run: () => generatePage2(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generatePage2(normalizedSchema, paths.containerDir, namespacedOptions).files
     }
   ];
   if (normalizedSchema.actions?.create || normalizedSchema.actions?.edit) {
     steps.push({
       name: "Form",
-      run: () => generateForm(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generateForm(normalizedSchema, paths.containerDir, namespacedOptions).files
     });
   }
   if (normalizedSchema.actions?.create) {
     steps.push({
       name: "Create page",
-      run: () => generateCreatePage(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generateCreatePage(normalizedSchema, paths.containerDir, namespacedOptions).files
     });
   }
   if (normalizedSchema.actions?.edit) {
     steps.push({
       name: "Edit page",
-      run: () => generateEditPage(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generateEditPage(normalizedSchema, paths.containerDir, namespacedOptions).files
     });
   }
   steps.push({
@@ -23537,11 +23568,11 @@ function runSinglePipeline(schema, cwd, config, options = {}) {
     },
     {
       name: "Form",
-      run: () => generateSingleForm(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generateSingleForm(normalizedSchema, paths.containerDir, namespacedOptions).files
     },
     {
       name: "Single page",
-      run: () => generateSinglePage(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generateSinglePage(normalizedSchema, paths.containerDir, namespacedOptions).files
     },
     {
       name: "Navigation",
@@ -24460,7 +24491,7 @@ async function maybeBuildRenamePlan(loaded, cwd, config, generatedFiles, options
         plan.customCells.push(
           buildCustomCellRenameSelection(
             loaded.schema.name,
-            paths.pagesDir,
+            paths.containerDir,
             candidate.before,
             candidate.after
           )
@@ -25965,36 +25996,26 @@ function buildLeafField(input) {
   if (errors.length > 0) {
     throw new Error(errors.join("\n"));
   }
-  const field = {
+  if (input.kind === "form") {
+    return {
+      name: input.name,
+      type: input.type,
+      label: input.label,
+      ...input.required ? { required: true } : {},
+      ...input.multiple && input.type === "file" ? { multiple: true } : {},
+      ...input.options?.length ? { options: input.options } : {}
+    };
+  }
+  return {
     name: input.name,
     type: input.type,
-    label: input.label
+    label: input.label,
+    ...input.required ? { required: true } : {},
+    ...input.multiple && ["select", "relationship"].includes(input.type) ? { multiple: true } : {},
+    ...input.creatable && input.type === "select" ? { creatable: true } : {},
+    ...input.options?.length ? { options: input.options } : {},
+    ...input.relationship && input.type === "relationship" ? { relationship: input.relationship } : {}
   };
-  if (input.required) {
-    field.required = true;
-  }
-  if (input.kind === "form") {
-    if (input.multiple && input.type === "file") {
-      field.multiple = true;
-    }
-    if (input.options && input.options.length > 0) {
-      field.options = input.options;
-    }
-    return field;
-  }
-  if (input.multiple && ["select", "relationship"].includes(input.type)) {
-    field.multiple = true;
-  }
-  if (input.creatable && input.type === "select") {
-    field.creatable = true;
-  }
-  if (input.options && input.options.length > 0) {
-    field.options = input.options;
-  }
-  if (input.relationship && input.type === "relationship") {
-    field.relationship = input.relationship;
-  }
-  return field;
 }
 
 // adapters/next/commands/schema-prompts/apply-advanced-options.ts
@@ -26112,14 +26133,12 @@ function applyDerivedFieldDefaults(field, type, options) {
   if (!options.derivePlaceholder) {
     return;
   }
-  const record = field;
-  if (typeof record.placeholder === "string" && record.placeholder.trim()) {
+  if (typeof field.placeholder === "string" && field.placeholder.trim()) {
     return;
   }
-  const label = typeof record.label === "string" ? record.label : "";
-  const placeholder = derivePlaceholderFromLabel(type, label);
+  const placeholder = derivePlaceholderFromLabel(type, field.label ?? "");
   if (placeholder) {
-    record.placeholder = placeholder;
+    field.placeholder = placeholder;
   }
 }
 
@@ -29830,17 +29849,19 @@ function guardPackageJson(cwd, restores) {
   } catch {
     return { localSpecDeps: [], removedCliDep: false };
   }
+  if (!isRecord(parsed)) {
+    return { localSpecDeps: [], removedCliDep: false };
+  }
   const localSpecDeps = [];
   let removedCliDep = false;
   for (const section of ["dependencies", "devDependencies"]) {
     const deps = parsed[section];
-    if (!deps || typeof deps !== "object") continue;
-    const record = deps;
-    if ("betterstart-cli" in record) {
-      Reflect.deleteProperty(record, "betterstart-cli");
+    if (!isRecord(deps)) continue;
+    if ("betterstart-cli" in deps) {
+      Reflect.deleteProperty(deps, "betterstart-cli");
       removedCliDep = true;
     }
-    for (const [name, spec] of Object.entries(record)) {
+    for (const [name, spec] of Object.entries(deps)) {
       if (typeof spec === "string" && LOCAL_PROTOCOL_PATTERN.test(spec)) {
         localSpecDeps.push(name);
       }
@@ -30007,13 +30028,12 @@ function parseRailwayJson(output) {
 
 // adapters/next/init/railway/resources/parse-service.ts
 function parseService(value) {
-  if (!value || typeof value !== "object") return void 0;
-  const service = value;
-  if (!isNonEmptyString(service.id) || !isNonEmptyString(service.name)) return void 0;
-  const replicas = service.replicas && typeof service.replicas === "object" ? service.replicas : void 0;
+  if (!isRecord(value)) return void 0;
+  if (!isNonEmptyString(value.id) || !isNonEmptyString(value.name)) return void 0;
+  const replicas = isRecord(value.replicas) ? value.replicas : void 0;
   return {
-    id: service.id,
-    name: service.name,
+    id: value.id,
+    name: value.name,
     replicaCount: typeof replicas?.configured === "number" ? replicas.configured : void 0
   };
 }
@@ -30039,8 +30059,8 @@ ${result.stderr}`) ?? "Could not list Railway services."
   if (!Array.isArray(payload)) {
     throw new Error("Railway returned an invalid service list response.");
   }
-  const services = payload.map(parseService);
-  if (services.some((service) => !service)) {
+  const services = payload.map(parseService).filter((service) => service !== void 0);
+  if (services.length !== payload.length) {
     throw new Error("Railway returned an invalid service list response.");
   }
   return services;
@@ -30076,7 +30096,7 @@ function deploymentLine(line) {
   let message = line;
   try {
     const parsed = JSON.parse(line);
-    const jsonMessage = parsed.message ?? parsed.status;
+    const jsonMessage = isRecord(parsed) ? parsed.message ?? parsed.status : void 0;
     if (typeof jsonMessage === "string") message = jsonMessage;
   } catch {
   }
@@ -30094,26 +30114,21 @@ function parseDomainUrl(value) {
       return void 0;
     }
   }
-  if (!value || typeof value !== "object") return void 0;
-  const record = value;
-  return parseDomainUrl(record.domain);
+  return isRecord(value) ? parseDomainUrl(value.domain) : void 0;
 }
 
 // adapters/next/init/railway/deploy/first-domain-url.ts
 function firstDomainUrl(payload) {
   const direct = parseDomainUrl(payload);
   if (direct) return direct;
-  if (!payload || typeof payload !== "object") return void 0;
-  const domains = payload.domains;
-  return Array.isArray(domains) ? domains.map(parseDomainUrl).find((domain) => Boolean(domain)) : void 0;
+  if (!isRecord(payload) || !Array.isArray(payload.domains)) return void 0;
+  return payload.domains.map(parseDomainUrl).find((domain) => Boolean(domain));
 }
 
 // adapters/next/init/railway/deploy/parse-domain-list.ts
 function parseDomainList(payload) {
-  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return void 0;
-  const domains = payload.domains;
-  if (!Array.isArray(domains)) return void 0;
-  const parsed = domains.map(parseDomainUrl);
+  if (!isRecord(payload) || !Array.isArray(payload.domains)) return void 0;
+  const parsed = payload.domains.map(parseDomainUrl);
   return parsed.every((domain) => Boolean(domain)) ? parsed : void 0;
 }
 
@@ -30198,14 +30213,17 @@ ${result.stderr}`) ?? `Could not read Railway variables for ${service}.`
     );
   }
   const payload = parseRailwayJson(result.stdout);
-  if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
+  if (!isRecord(payload)) {
     throw new Error(`Railway returned an invalid variable list response for ${service}.`);
   }
-  const entries = Object.entries(payload);
-  if (entries.some(([, value]) => typeof value !== "string")) {
-    throw new Error(`Railway returned an invalid variable list response for ${service}.`);
+  const variables = {};
+  for (const [name, value] of Object.entries(payload)) {
+    if (typeof value !== "string") {
+      throw new Error(`Railway returned an invalid variable list response for ${service}.`);
+    }
+    variables[name] = value;
   }
-  return Object.fromEntries(entries);
+  return variables;
 }
 
 // adapters/next/init/railway/deploy/collect-railway-deploy-env-vars.ts
@@ -30412,32 +30430,18 @@ ${deploy.stderr}`) ?? deploy.errorMessage
 
 // adapters/next/init/railway/resources/parse-bucket-credentials.ts
 function parseBucketCredentials(value) {
-  if (!value || typeof value !== "object") return void 0;
-  const credentials = value;
-  const keys = [
-    "endpoint",
-    "accessKeyId",
-    "secretAccessKey",
-    "bucketName",
-    "region",
-    "urlStyle"
-  ];
-  if (!keys.every((key) => isNonEmptyString(credentials[key]))) return void 0;
-  return {
-    endpoint: credentials.endpoint,
-    accessKeyId: credentials.accessKeyId,
-    secretAccessKey: credentials.secretAccessKey,
-    bucketName: credentials.bucketName,
-    region: credentials.region,
-    urlStyle: credentials.urlStyle
-  };
+  if (!isRecord(value)) return void 0;
+  const { endpoint, accessKeyId, secretAccessKey, bucketName, region, urlStyle } = value;
+  if (!isNonEmptyString(endpoint) || !isNonEmptyString(accessKeyId) || !isNonEmptyString(secretAccessKey) || !isNonEmptyString(bucketName) || !isNonEmptyString(region) || !isNonEmptyString(urlStyle)) {
+    return void 0;
+  }
+  return { endpoint, accessKeyId, secretAccessKey, bucketName, region, urlStyle };
 }
 
 // adapters/next/init/railway/resources/parse-bucket.ts
 function parseBucket(value) {
-  if (!value || typeof value !== "object") return void 0;
-  const bucket = value;
-  return isNonEmptyString(bucket.id) && isNonEmptyString(bucket.name) ? { id: bucket.id, name: bucket.name } : void 0;
+  if (!isRecord(value)) return void 0;
+  return isNonEmptyString(value.id) && isNonEmptyString(value.name) ? { id: value.id, name: value.name } : void 0;
 }
 
 // adapters/next/init/railway/resources/provision-railway-bucket-resource.ts
@@ -30573,10 +30577,9 @@ import pc5 from "picocolors";
 
 // adapters/next/init/railway/auth/is-railway-account.ts
 function isRailwayAccount(value) {
-  if (!value || typeof value !== "object") return false;
-  const account = value;
-  return typeof account.email === "string" && Array.isArray(account.workspaces) && account.workspaces.every(
-    (workspace) => workspace !== null && typeof workspace === "object" && typeof workspace.id === "string" && typeof workspace.name === "string"
+  if (!isRecord(value)) return false;
+  return typeof value.email === "string" && Array.isArray(value.workspaces) && value.workspaces.every(
+    (workspace) => isRecord(workspace) && typeof workspace.id === "string" && typeof workspace.name === "string"
   );
 }
 
@@ -30607,9 +30610,7 @@ async function checkRailwayProjectToken(runner, cwd, env) {
     return { authed: false, reason: result.timedOut ? "timeout" : "invalid-token" };
   }
   const project2 = parseRailwayJson(result.stdout);
-  if (!project2 || typeof project2 !== "object") return { authed: false, reason: "failed" };
-  const record = project2;
-  return typeof record.id === "string" && typeof record.name === "string" ? { authed: true } : { authed: false, reason: "failed" };
+  return isRecord(project2) && typeof project2.id === "string" && typeof project2.name === "string" ? { authed: true } : { authed: false, reason: "failed" };
 }
 
 // adapters/next/init/railway/auth/ensure-railway-auth.ts
@@ -30686,18 +30687,14 @@ function isRailwayProjectNameConflict(detail) {
 
 // adapters/next/init/railway/project/parse-project-summary.ts
 function parseProjectSummary(value) {
-  if (!value || typeof value !== "object") return void 0;
-  const project2 = value;
-  if (!isNonEmptyString(project2.id) || !isNonEmptyString(project2.name)) return void 0;
-  const workspaceValue = project2.workspace;
+  if (!isRecord(value)) return void 0;
+  if (!isNonEmptyString(value.id) || !isNonEmptyString(value.name)) return void 0;
+  const candidate = value.workspace;
   let workspace;
-  if (workspaceValue && typeof workspaceValue === "object") {
-    const candidate = workspaceValue;
-    if (isNonEmptyString(candidate.id) && isNonEmptyString(candidate.name)) {
-      workspace = { id: candidate.id, name: candidate.name };
-    }
+  if (isRecord(candidate) && isNonEmptyString(candidate.id) && isNonEmptyString(candidate.name)) {
+    workspace = { id: candidate.id, name: candidate.name };
   }
-  return { id: project2.id, name: project2.name, workspace };
+  return { id: value.id, name: value.name, workspace };
 }
 
 // adapters/next/init/railway/project/railway-project-name-is-taken.ts
@@ -30735,9 +30732,7 @@ ${result.stderr}`);
 
 // adapters/next/init/railway/project/is-deleted-railway-project.ts
 function isDeletedRailwayProject(value) {
-  if (!value || typeof value !== "object") return false;
-  const deletedAt = value.deletedAt;
-  return isNonEmptyString(deletedAt);
+  return isRecord(value) && isNonEmptyString(value.deletedAt);
 }
 
 // adapters/next/init/railway/project/list-railway-projects.ts
@@ -30757,8 +30752,9 @@ ${result.stderr}`) ?? "Could not list Railway projects."
   if (!Array.isArray(payload)) {
     throw new Error("Railway returned an invalid project list response.");
   }
-  const projects = payload.filter((project2) => !isDeletedRailwayProject(project2)).map(parseProjectSummary);
-  if (projects.some((project2) => !project2)) {
+  const live = payload.filter((project2) => !isDeletedRailwayProject(project2));
+  const projects = live.map(parseProjectSummary).filter((project2) => project2 !== void 0);
+  if (projects.length !== live.length) {
     throw new Error("Railway returned an invalid project list response.");
   }
   return projects;
@@ -32246,7 +32242,9 @@ function scaffoldLayout({ cwd, config }) {
     readTemplate("pages/reset-password-form.tsx")
   );
   write(path74.join(config.paths.pages, "page.tsx"), readTemplate("pages/dashboard-page.tsx"));
-  const usersDir = path74.join(config.paths.pages, "users");
+  const containerDir = path74.join(config.paths.pages, ADMIN_CONTAINER_ROUTE_GROUP);
+  write(path74.join(containerDir, "layout.tsx"), readTemplate("pages/container-layout.tsx"));
+  const usersDir = path74.join(containerDir, "users");
   write(path74.join(usersDir, "page.tsx"), readTemplate("pages/users/users-page.tsx"));
   write(
     path74.join(usersDir, "users-page-skeleton.tsx"),
@@ -32354,7 +32352,7 @@ function scaffoldLayout({ cwd, config }) {
     path74.join(settingsWebhooksDir, "logs", "page.tsx"),
     readTemplate("pages/settings/webhooks/webhooks-logs-page.tsx")
   );
-  const mediaDir = path74.join(config.paths.pages, "media");
+  const mediaDir = path74.join(containerDir, "media");
   write(path74.join(mediaDir, "page.tsx"), readTemplate("pages/media/media-page.tsx"));
   write(
     path74.join(mediaDir, "media-page-skeleton.tsx"),
@@ -33343,8 +33341,12 @@ function scaffoldTsconfig(cwd, config) {
     skipped.push("Failed to parse tsconfig.json");
     return { added, skipped };
   }
-  const compilerOptions = tsconfig.compilerOptions ?? {};
-  const paths = compilerOptions.paths ?? {};
+  if (!isRecord(tsconfig)) {
+    skipped.push("Failed to parse tsconfig.json");
+    return { added, skipped };
+  }
+  const compilerOptions = isRecord(tsconfig.compilerOptions) ? tsconfig.compilerOptions : {};
+  const paths = isRecord(compilerOptions.paths) ? compilerOptions.paths : {};
   if (compilerOptions.resolveJsonModule === true) {
     skipped.push("compilerOptions.resolveJsonModule");
   } else {
@@ -33706,7 +33708,9 @@ function readLinkedProjectJson(cwd) {
   try {
     const projectJsonPath = path82.join(cwd, ".vercel", "project.json");
     if (!fs70.existsSync(projectJsonPath)) return void 0;
-    return JSON.parse(fs70.readFileSync(projectJsonPath, "utf-8"));
+    const parsed = JSON.parse(fs70.readFileSync(projectJsonPath, "utf-8"));
+    if (!isRecord(parsed)) return void 0;
+    return typeof parsed.projectId === "string" ? { projectId: parsed.projectId } : {};
   } catch {
     return void 0;
   }
@@ -34478,11 +34482,11 @@ function parseIdList(value, isId, formatUnknownMessage) {
     return [];
   }
   const ids = value.split(",").map((entry) => entry.trim()).filter(Boolean);
-  const invalid = ids.filter((id) => !isId(id));
-  if (invalid.length > 0) {
-    throw new Error(formatUnknownMessage(invalid));
+  const valid = ids.filter(isId);
+  if (valid.length !== ids.length) {
+    throw new Error(formatUnknownMessage(ids.filter((id) => !isId(id))));
   }
-  return unique(ids);
+  return unique(valid);
 }
 
 // adapters/next/integration-runtime/parse-integration-list.ts
@@ -34643,7 +34647,7 @@ async function main() {
 
   if (CHECK_ADMIN_ONLY) {
     if (existingAdmin) {
-      console.log(\`EXISTING_ADMIN:\${JSON.stringify(existingAdmin)}\`)
+      process.stdout.write(\`EXISTING_ADMIN:\${JSON.stringify(existingAdmin)}\\n\`)
       process.exit(3)
     }
     process.exit(0)
@@ -34654,7 +34658,7 @@ async function main() {
   const NAME = process.env.SEED_NAME || 'Admin'
 
   if (!EMAIL || !PASSWORD) {
-    console.error('  SEED_EMAIL and SEED_PASSWORD are required.')
+    process.stderr.write('  SEED_EMAIL and SEED_PASSWORD are required.\\n')
     process.exit(1)
   }
 
@@ -34669,15 +34673,15 @@ async function main() {
 
   if (existingUser && !replaceTarget) {
     // Exit code 2 signals "user exists" to the CLI
-    console.log(\`EXISTING_USER:\${existingUser.name}\`)
+    process.stdout.write(\`EXISTING_USER:\${existingUser.name}\\n\`)
     process.exit(2)
   }
 
   if (replaceTarget) {
-    console.log(
+    process.stdout.write(
       OVERWRITE_MODE === 'admin'
-        ? '\\n  Replacing existing admin user...'
-        : '\\n  Replacing existing account...'
+        ? '\\n  Replacing existing admin user...\\n'
+        : '\\n  Replacing existing account...\\n'
     )
     await clearAuthorshipReferences(replaceTarget.id)
     // Remove existing account + session rows first (foreign key refs)
@@ -34685,17 +34689,17 @@ async function main() {
     await db.delete(schema.account).where(eq(schema.account.userId, replaceTarget.id))
     await db.delete(schema.user).where(eq(schema.user.id, replaceTarget.id))
   } else {
-    console.log('\\n  Creating admin user...')
+    process.stdout.write('\\n  Creating admin user...\\n')
   }
 
-  console.log(\`  Email: \${EMAIL}\\n\`)
+  process.stdout.write(\`  Email: \${EMAIL}\\n\\n\`)
 
   const result = await auth.api.signUpEmail({
     body: { email: EMAIL, password: PASSWORD, name: NAME },
   })
 
   if (!result?.user) {
-    console.error('  Failed to create user.')
+    process.stderr.write('  Failed to create user.\\n')
     process.exit(1)
   }
 
@@ -34704,13 +34708,13 @@ async function main() {
     .set({ role: 'admin' })
     .where(eq(schema.user.id, result.user.id))
 
-  console.log(\`  Admin user \${replaceTarget ? 'replaced' : 'created'}: \${EMAIL}\`)
-  console.log('  Role: admin\\n')
+  process.stdout.write(\`  Admin user \${replaceTarget ? 'replaced' : 'created'}: \${EMAIL}\\n\`)
+  process.stdout.write('  Role: admin\\n\\n')
   process.exit(0)
 }
 
 main().catch((err) => {
-  console.error('  Seed failed:', err.message || err)
+  process.stderr.write(\`  Seed failed: \${err.message || err}\\n\`)
   process.exit(1)
 })
 `;
@@ -35232,7 +35236,7 @@ function writeInitJson(context, payload) {
   context.restoreStdout?.();
   context.restoreStdout = void 0;
   context.written = true;
-  console.log(JSON.stringify(payload, null, 2));
+  writeMachineJson(payload);
 }
 
 // adapters/next/commands/init/run-init-command-internal.ts
@@ -35772,7 +35776,7 @@ async function runInitCommandInternal(name, options, jsonContext) {
   const drizzleConfigPath = path92.join(cwd, "drizzle.config.ts");
   if (!dbFiles.includes("drizzle.config.ts") && fs79.existsSync(drizzleConfigPath)) {
     if (forceMode) {
-      const { readNamespacedTemplate } = await import("./read-namespaced-template-D2CD4Q7U.js");
+      const { readNamespacedTemplate } = await import("./read-namespaced-template-KUENIIDC.js");
       fs79.writeFileSync(
         drizzleConfigPath,
         readNamespacedTemplate("drizzle.config.ts", namespace),
@@ -35785,7 +35789,7 @@ async function runInitCommandInternal(name, options, jsonContext) {
         initialValue: true
       });
       if (!p61.isCancel(overwrite) && overwrite) {
-        const { readNamespacedTemplate } = await import("./read-namespaced-template-D2CD4Q7U.js");
+        const { readNamespacedTemplate } = await import("./read-namespaced-template-KUENIIDC.js");
         fs79.writeFileSync(
           drizzleConfigPath,
           readNamespacedTemplate("drizzle.config.ts", namespace),
@@ -36218,7 +36222,7 @@ async function runListIntegrationsCommand(options) {
     try {
       installed2 = new Set((await resolveConfig(cwd)).integrations.installed);
     } catch (error) {
-      console.error(
+      writeDiagnostic(
         `Error loading config: ${error instanceof Error ? error.message : String(error)}`
       );
       process.exit(1);
@@ -36229,7 +36233,7 @@ async function runListIntegrationsCommand(options) {
       kind: integration.kind,
       description: integration.description
     }));
-    console.log(JSON.stringify(items, null, 2));
+    writeMachineJson(items);
     return;
   }
   const config = await resolveConfigOrExit(cwd);
@@ -36263,7 +36267,7 @@ async function runListPresetsCommand(options) {
     try {
       installed2 = new Set((await resolveConfig(cwd)).presets.installed);
     } catch (error) {
-      console.error(
+      writeDiagnostic(
         `Error loading config: ${error instanceof Error ? error.message : String(error)}`
       );
       process.exit(1);
@@ -36274,7 +36278,7 @@ async function runListPresetsCommand(options) {
       kind: preset.kind,
       description: preset.description
     }));
-    console.log(JSON.stringify(items, null, 2));
+    writeMachineJson(items);
     return;
   }
   const config = await resolveConfigOrExit(cwd);
@@ -38010,6 +38014,11 @@ var TEMPLATE_REGISTRY = {
     base: "cwd",
     dependencies: ["auth-gate"]
   },
+  "container-layout": {
+    relPath: "app/(admin)/admin/(authenticated)/(container)/layout.tsx",
+    content: () => readTemplate("pages/container-layout.tsx"),
+    base: "cwd"
+  },
   "auth-gate": {
     relPath: "app/(admin)/admin/(authenticated)/auth-gate.tsx",
     content: () => readTemplate("pages/auth-gate.tsx"),
@@ -39175,15 +39184,15 @@ async function runRemoveSchemaCommand(schemaName, options) {
     if (removePath(cwd, `${paths.adminActionsDir}/${schemaName}`)) {
       deletedPaths.push(`${paths.adminActionsDir}/${schemaName}`);
     }
-    if (removePath(cwd, `${paths.pagesDir}/forms/${kebabName}`)) {
-      deletedPaths.push(`${paths.pagesDir}/forms/${kebabName}`);
+    if (removePath(cwd, `${paths.containerDir}/forms/${kebabName}`)) {
+      deletedPaths.push(`${paths.containerDir}/forms/${kebabName}`);
     }
   } else {
     if (removePath(cwd, `${paths.adminActionsDir}/${schemaName}`)) {
       deletedPaths.push(`${paths.adminActionsDir}/${schemaName}`);
     }
-    if (removePath(cwd, `${paths.pagesDir}/${schemaName}`)) {
-      deletedPaths.push(`${paths.pagesDir}/${schemaName}`);
+    if (removePath(cwd, `${paths.containerDir}/${schemaName}`)) {
+      deletedPaths.push(`${paths.containerDir}/${schemaName}`);
     }
   }
   cleanupSchemaEmptyDirs(cwd, deletedPaths, paths);
@@ -39426,21 +39435,18 @@ function collectSchemaRelationshipTargets(loaded) {
   function walkFields2(fields) {
     if (!Array.isArray(fields)) return;
     for (const field of fields) {
-      if (!field || typeof field !== "object") {
+      if (!isRecord(field)) {
         continue;
       }
-      const fieldRecord = field;
-      const relationship = typeof fieldRecord.relationship === "string" ? fieldRecord.relationship : void 0;
-      if (relationship) {
-        targets.add(relationship);
+      if (typeof field.relationship === "string") {
+        targets.add(field.relationship);
       }
-      walkFields2(fieldRecord.fields);
-      if (Array.isArray(fieldRecord.tabs)) {
-        for (const tab of fieldRecord.tabs) {
-          if (!tab || typeof tab !== "object") {
-            continue;
+      walkFields2(field.fields);
+      if (Array.isArray(field.tabs)) {
+        for (const tab of field.tabs) {
+          if (isRecord(tab)) {
+            walkFields2(tab.fields);
           }
-          walkFields2(tab.fields);
         }
       }
     }
@@ -39964,8 +39970,9 @@ function cleanTsconfig(tsconfigPath, aliasRoot = "@admin") {
   } catch {
     return [];
   }
-  const compilerOptions = tsconfig.compilerOptions ?? {};
-  const paths = compilerOptions.paths ?? {};
+  if (!isRecord(tsconfig)) return [];
+  const compilerOptions = isRecord(tsconfig.compilerOptions) ? tsconfig.compilerOptions : {};
+  const paths = isRecord(compilerOptions.paths) ? compilerOptions.paths : {};
   const removed = [];
   for (const key of Object.keys(paths)) {
     if (key.startsWith("@admin/") || key === "@admin/*" || key.startsWith(`${aliasRoot}/`) || key === `${aliasRoot}/*`) {
@@ -40482,7 +40489,7 @@ async function runUpdateCommand(components, options) {
         ...templateKeys.map((name) => ({ name, path: templatePath(name), kind: "template" })),
         { name: "tiptap", path: "components/custom/content-editor/tiptap-*/", kind: "special" }
       ];
-      console.log(JSON.stringify(items, null, 2));
+      writeMachineJson(items);
       return;
     }
     const all = getAllComponentNames();