aegisnode 0.0.4 → 0.0.5

package/README.md

@@ -43,6 +43,7 @@ It keeps the development model simple, but adds enough structure and tooling to
 Core features:
 
 - CLI generators (`startproject`, `createapp`, `runserver`)
+- App scaffold repair command (`fix`)
 - Startup entry generator (`generateloader`)
 - Project health checker (`doctor`)
 - Dependency updater (`updatedeps`)
@@ -61,7 +62,7 @@ Core features:
 - Root route file `routes.js` (not `routes/` folder)
 - Automatic default confirmation page on `/` when no custom `/` route exists
 - App folder uses `views.js` (not `controllers/` folder)
-- `createapp` uses file modules: `views.js`, `models.js`, `validators.js`, `routes.js`, `subscribers.js`, `services.js`
+- `createapp` uses file modules: `views.js`, `models.js`, `validators.js`, `routes.js`, `subscribers.js`, `services.js`, `utils.js`
 - `createapp` also generates app tests in `apps/<app>/tests`
 - EJS templates configurable in `settings.js` with Django-style base layout flow
 - Built-in runtime helpers (`money`, `number`, `dateTime`, `timeElapsed`, `toObjectId`) + `jlive` bridge
@@ -90,16 +91,18 @@ npm --prefix blog install
 aegisnode runserver --project blog
 
 aegisnode createapp users --project blog
+aegisnode fix --app users --project blog
 aegisnode generate view profile --app users --project blog
 aegisnode generate route profile --app users --project blog
 aegisnode generateloader --project blog
 aegisnode doctor --project blog
+aegisnode doctor --app users --project blog
 aegisnode updatedeps --project blog
 ```
 
 `cd blog` is optional. You can run commands from parent folder with `--project blog`.
 
-`createapp`, `generate`, `runserver`, `generateloader`, `doctor`, and `updatedeps` are project-level commands.
+`createapp`, `fix`, `generate`, `runserver`, `generateloader`, `doctor`, and `updatedeps` are project-level commands.
 Run them from the project root; do not `cd` into `apps/<app>`.
 Startup mode rules:
 - Development (`env === development`): start with `aegisnode runserver` only.
@@ -107,6 +110,20 @@ Startup mode rules:
 - `node app.js` and `node loader.cjs` are rejected in development mode.
 - `aegisnode runserver` is rejected outside development mode.
 
+### Trust Proxy
+
+If your app runs behind Nginx, Apache, Passenger, or another reverse proxy that terminates HTTPS before the Node process, set top-level `trustProxy` in `settings.js`:
+
+```js
+export default {
+  trustProxy: 1,
+};
+```
+
+This is the AegisNode equivalent of `app.set('trust proxy', 1)` in raw Express. It makes `req.secure`, `req.protocol`, client IP detection, secure cookies, and HTTPS-aware auth logic behave correctly behind the proxy.
+
+Prefer an exact value such as `1`, `'loopback'`, or a subnet string instead of `true`.
+
 ### Deploy On Phusion Passenger
 
 AegisNode supports Passenger-style startup using the generated `loader.cjs`.
@@ -170,6 +187,26 @@ aegisnode doctor
 - Auth safety checks (JWT secret, OAuth2 `allowHttp` in production)
 - Template directory availability
 
+Run app-level scaffold checks for one app:
+
+```bash
+aegisnode doctor --app users
+```
+
+App-level doctor focuses on the named app:
+- Missing `views.js`, `models.js`, `services.js`, `validators.js`, `routes.js`, `subscribers.js`, `utils.js`
+- Missing generated test files under `apps/<app>/tests`
+- Missing `settings.apps` declaration for that app
+- Missing central `routes.js` import/mount when `autoMountApps` is off
+
+Repair a partially missing app scaffold:
+
+```bash
+aegisnode fix --app users
+```
+
+`fix` recreates missing default app files and tests without overwriting existing files. If the app is missing from `settings.apps` or central `routes.js`, it restores those registrations too.
+
 Regenerate project startup entry files if needed:
 
 ```bash
@@ -288,16 +325,24 @@ Each generated app usually contains:
 - `apps/<app>/views.js`
 - `apps/<app>/models.js`
 - `apps/<app>/services.js`
+- `apps/<app>/utils.js`
 - `apps/<app>/subscribers.js`
 - `apps/<app>/routes.js`
 
 Usage by file:
 - `views.js`: HTTP handlers (`req`, `res`, `next`). Default signature can be context-first: `handler({ service, validator, services, validators, ... }, req, res, next)`.
+  Keep `views.js` thin: prefer only the view class and its imports. Avoid defining extra local helper/utility functions in the view file. Move reusable pure logic to `utils.js` and app workflows to `services.js`.
 - `models.js`: data access layer only (SQL/NoSQL operations).
-- `services.js`: business logic layer; orchestrates models.
+- `services.js`: business logic layer; orchestrates models and uses injected runtime objects when needed.
+- `utils.js`: app-local pure utility functions. Use this for small reusable helpers that belong only to the app. Do not put DB access, request validation, or business workflows here.
+  `utils.js` is a plain module, not an injected runtime layer. If a utility needs `jlive`, `helpers`, `i18n`, or another injected runtime object, inject that object into a view/service/model first and pass it into the utility function as an argument.
 - `subscribers.js`: event listeners (for example `app.booted`, `ws.connection`, custom events).
 - `routes.js`: route mapping only (`route.get(...)`, `route.post(...)`, `route.use(...)`) to view handlers.
 
+Short rule for `utils.js` vs `services.js`:
+- Use `utils.js` for pure app-local helpers such as string formatting, slug generation, payload shaping, or small mappers.
+- Use `services.js` for application behavior: anything that coordinates models, injected runtime objects, or feature rules.
+
 Route modules are mapping-only (`register(route)`).
 Framework context is injected into handlers as first argument (when handler uses 4 args): `{ service, validator, services, models, validators, auth, mail, helpers, i18n, events, ... }`.
 `req.aegis` is also available.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aegisnode",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "A view-first Node.js framework for modular web apps and JSON APIs with CLI scaffolding, runtime injection, auth, uploads, i18n, mail, and WebSocket support.",
   "type": "module",
   "main": "./src/index.js",

package/scripts/smoke-test.js

@@ -7,6 +7,7 @@ import path from 'path';
 import fs from 'fs/promises';
 import { startProject } from '../src/cli/commands/startproject.js';
 import { createApp } from '../src/cli/commands/createapp.js';
+import { runCli } from '../src/cli/index.js';
 import { generateArtifact } from '../src/cli/commands/generate.js';
 import { createKernel } from '../src/runtime/kernel.js';
 import { runServer } from '../src/cli/commands/runserver.js';
@@ -16,6 +17,7 @@ import { createAuthManager, normalizeAuthConfig } from '../src/runtime/auth.js';
 import { loadProjectConfig } from '../src/runtime/config.js';
 import { initializeDatabase, closeDatabase } from '../src/runtime/database.js';
 import { runDoctor } from '../src/cli/commands/doctor.js';
+import { runFixApp } from '../src/cli/commands/fixapp.js';
 import { runUpdateDependencies } from '../src/cli/commands/updatedeps.js';
 import { createHelpers } from '../src/runtime/helpers.js';
 
@@ -590,6 +592,7 @@ dkcqnJD4SGWVeG+KhA==
   await fs.access(path.join(projectRoot, 'apps', 'users', 'models.js'));
   await fs.access(path.join(projectRoot, 'apps', 'users', 'validators.js'));
   await fs.access(path.join(projectRoot, 'apps', 'users', 'services.js'));
+  await fs.access(path.join(projectRoot, 'apps', 'users', 'utils.js'));
   await fs.access(path.join(projectRoot, 'apps', 'users', 'subscribers.js'));
   await fs.access(path.join(projectRoot, 'apps', 'users', 'tests', 'models.test.js'));
   await fs.access(path.join(projectRoot, 'apps', 'users', 'tests', 'validators.test.js'));
@@ -605,6 +608,90 @@ dkcqnJD4SGWVeG+KhA==
   assert.equal(doctorReport.summary.errors, 0);
   const projectRoutesFile = await fs.readFile(path.join(projectRoot, 'routes.js'), 'utf8');
   assert.match(projectRoutesFile, /route\.use\((['"])\/users\1, users\);/);
+
+  await fs.unlink(path.join(projectRoot, 'apps', 'users', 'utils.js'));
+  await fs.unlink(path.join(projectRoot, 'apps', 'users', 'tests', 'routes.test.js'));
+  await fs.writeFile(
+    path.join(projectRoot, 'routes.js'),
+    projectRoutesFile
+      .replace(/import users from '\.\/apps\/users\/routes\.js';\n/, '')
+      .replace(/\s*route\.use\((['"])\/users\1, users\);\n/, '\n'),
+    'utf8',
+  );
+  const appDoctorRouteReport = await runDoctor({
+    projectRoot,
+    appName: 'users',
+    failOnError: false,
+    output: {
+      log() {},
+    },
+  });
+  assert.equal(
+    appDoctorRouteReport.entries.some((entry) => entry.message.includes('Project routes.js is missing import for app "users".')),
+    true,
+  );
+  assert.equal(
+    appDoctorRouteReport.entries.some((entry) => entry.message.includes('Project routes.js is missing route.use(...) mount for app "users".')),
+    true,
+  );
+
+  const settingsBeforeFix = await fs.readFile(path.join(projectRoot, 'settings.js'), 'utf8');
+  await fs.writeFile(
+    path.join(projectRoot, 'settings.js'),
+    settingsBeforeFix.replace(/\n\s*\{ name: "users", mount: "\/users" \},/, ''),
+    'utf8',
+  );
+
+  const appDoctorReport = await runDoctor({
+    projectRoot,
+    appName: 'users',
+    failOnError: false,
+    output: {
+      log() {},
+    },
+  });
+  assert.equal(appDoctorReport.summary.errors, 0);
+  assert.equal(
+    appDoctorReport.entries.some((entry) => entry.message.includes('App "users" is not declared in settings.apps.')),
+    true,
+  );
+  assert.equal(
+    appDoctorReport.entries.some((entry) => entry.message.includes('App "users" missing utils.js.')),
+    true,
+  );
+  assert.equal(
+    appDoctorReport.entries.some((entry) => entry.message.includes('App "users" missing tests/routes.test.js.')),
+    true,
+  );
+
+  const fixAppResult = await runFixApp({
+    appName: 'users',
+    projectRoot,
+  });
+  assert.equal(fixAppResult.registryUpdated, true);
+  assert.equal(fixAppResult.routesUpdated, true);
+  await fs.access(path.join(projectRoot, 'apps', 'users', 'utils.js'));
+  await fs.access(path.join(projectRoot, 'apps', 'users', 'tests', 'routes.test.js'));
+  const fixedSettingsFile = await fs.readFile(path.join(projectRoot, 'settings.js'), 'utf8');
+  assert.match(fixedSettingsFile, /\{ name: "users", mount: "\/users" \},/);
+  const fixedRoutesFile = await fs.readFile(path.join(projectRoot, 'routes.js'), 'utf8');
+  assert.match(fixedRoutesFile, /import users from '\.\/apps\/users\/routes\.js';/);
+  assert.match(fixedRoutesFile, /route\.use\((['"])\/users\1, users\);/);
+  await assert.doesNotReject(
+    () => runCli(['doctor', '--app', 'users', '--project', projectRoot]),
+  );
+  await assert.rejects(
+    () => runCli(['doctor', 'users', '--project', projectRoot]),
+    /Doctor app target must use --app <app-name>/,
+  );
+  await assert.doesNotReject(
+    () => runCli(['fix', '--app', 'users', '--project', projectRoot]),
+  );
+  await assert.rejects(
+    () => runCli(['fix', 'users', '--project', projectRoot]),
+    /Fix app target must use --app <app-name>/,
+  );
+
   await generateArtifact({
     type: 'view',
     name: 'profile',

package/src/cli/commands/createapp.js

@@ -1,191 +1,28 @@
-import fs from 'fs/promises';
-import path from 'path';
-import { pathToFileURL } from 'url';
-import { ensureDir, ensureValidName, exists, normalizeMountPath, writeFile } from '../utils/fs.js';
+import { ensureValidName, normalizeMountPath } from '../utils/fs.js';
 import { resolveProjectRoot } from '../utils/project.js';
 import {
-  renderAppRoutes,
-  renderAppViewsFile,
-  renderAppModelsFile,
-  renderAppValidatorsFile,
-  renderAppServicesFile,
-  renderAppSubscribersFile,
-  renderAppModelTest,
-  renderAppValidatorTest,
-  renderAppServiceTest,
-  renderAppRoutesTest,
-  renderSettingsApps,
-} from '../utils/scaffolds.js';
-
-const APPS_START = '// AEGIS_APPS_START';
-const APPS_END = '// AEGIS_APPS_END';
-
-function renderAppEntries(apps) {
-  return apps
-    .map((app) => `    { name: ${JSON.stringify(app.name)}, mount: ${JSON.stringify(app.mount)} },`)
-    .join('\n');
-}
-
-function toImportName(appName) {
-  const safe = appName
-    .split(/[-_\s]+/)
-    .filter(Boolean)
-    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
-    .join('');
-
-  if (!safe) {
-    return 'appRoutes';
-  }
-
-  return `${safe.charAt(0).toLowerCase()}${safe.slice(1)}`;
-}
-
-async function readDefaultExport(filePath) {
-  const moduleUrl = `${pathToFileURL(filePath).href}?t=${Date.now()}`;
-  const loaded = await import(moduleUrl);
-  return loaded?.default;
-}
-
-async function detectSettingsMode(projectRoot) {
-  const single = path.join(projectRoot, 'settings.js');
-  const split = path.join(projectRoot, 'settings', 'apps.js');
-
-  if (await exists(single)) {
-    return { mode: 'single', file: single };
-  }
-
-  if (await exists(split)) {
-    return { mode: 'split', file: split };
-  }
-
-  throw new Error(`Not an AegisNode project root: missing ${single} (or legacy ${split})`);
-}
-
-async function readAppsConfig(settingsMode) {
-  const normalizeApp = (entry) => {
-    if (!entry || typeof entry !== 'object' || typeof entry.name !== 'string') {
-      return null;
-    }
-
-    ensureValidName(entry.name, 'app');
-    return {
-      name: entry.name,
-      mount: normalizeMountPath(entry.mount || `/${entry.name}`),
-    };
-  };
-
-  if (settingsMode.mode === 'single') {
-    const settings = await readDefaultExport(settingsMode.file);
-    const apps = settings?.apps;
-
-    if (!Array.isArray(apps)) {
-      throw new Error(`settings.js must export { apps: [] }. File: ${settingsMode.file}`);
-    }
-
-    return apps.map(normalizeApp).filter(Boolean);
-  }
-
-  const apps = await readDefaultExport(settingsMode.file);
-  if (!Array.isArray(apps)) {
-    throw new Error(`settings/apps.js must export an array. File: ${settingsMode.file}`);
-  }
-
-  return apps.map(normalizeApp).filter(Boolean);
-}
-
-async function updateSingleSettingsApps(settingsFile, apps) {
-  const current = await fs.readFile(settingsFile, 'utf8');
-
-  if (!current.includes(APPS_START) || !current.includes(APPS_END)) {
-    throw new Error(`settings.js is missing ${APPS_START}/${APPS_END} markers: ${settingsFile}`);
-  }
-
-  const replacement = `${APPS_START}\n${renderAppEntries(apps)}\n    ${APPS_END}`;
-  const updated = current.replace(/\/\/ AEGIS_APPS_START[\s\S]*?\/\/ AEGIS_APPS_END/m, replacement);
-
-  await writeFile(settingsFile, updated);
-}
-
-async function updateAppRegistry(projectRoot, apps, settingsMode) {
-  if (settingsMode.mode === 'single') {
-    await updateSingleSettingsApps(settingsMode.file, apps);
-    return;
-  }
-
-  await writeFile(path.join(projectRoot, 'settings', 'apps.js'), renderSettingsApps(apps));
-}
-
-async function updateProjectRoutesFile(projectRoot, appName, mountPath) {
-  const routesFile = path.join(projectRoot, 'routes.js');
-  if (!(await exists(routesFile))) {
-    // Keep backward compatibility for legacy projects that still use routes/index.js.
-    return;
-  }
-
-  const importName = toImportName(appName);
-  const importLine = `import ${importName} from './apps/${appName}/routes.js';`;
-  const routeLine = `    route.use(${JSON.stringify(mountPath)}, ${importName});`;
-
-  let content = await fs.readFile(routesFile, 'utf8');
-
-  if (!content.includes(importLine)) {
-    if (content.includes('// AEGIS_APP_IMPORTS_START') && content.includes('// AEGIS_APP_IMPORTS_END')) {
-      content = content.replace('// AEGIS_APP_IMPORTS_END', `${importLine}\n// AEGIS_APP_IMPORTS_END`);
-    } else {
-      content = `${importLine}\n${content}`;
-    }
-  }
-
-  if (!content.includes(routeLine)) {
-    if (content.includes('// AEGIS_PROJECT_APP_ROUTES_START') && content.includes('// AEGIS_PROJECT_APP_ROUTES_END')) {
-      content = content.replace('    // AEGIS_PROJECT_APP_ROUTES_END', `${routeLine}\n    // AEGIS_PROJECT_APP_ROUTES_END`);
-    } else {
-      const match = content.match(/register\s*\([^)]*\)\s*{[\s\S]*?\n\s*}/m);
-      if (match) {
-        content = content.replace(match[0], `${match[0]}\n${routeLine}`);
-      }
-    }
-  }
-
-  await writeFile(routesFile, content);
-}
-
-async function createScaffold(projectRoot, appName) {
-  const appRoot = path.join(projectRoot, 'apps', appName);
-
-  await ensureDir(appRoot);
-  await ensureDir(path.join(appRoot, 'tests'));
-
-  await writeFile(path.join(appRoot, 'views.js'), renderAppViewsFile(appName));
-  await writeFile(path.join(appRoot, 'models.js'), renderAppModelsFile(appName));
-  await writeFile(path.join(appRoot, 'validators.js'), renderAppValidatorsFile(appName));
-  await writeFile(path.join(appRoot, 'services.js'), renderAppServicesFile(appName));
-  await writeFile(path.join(appRoot, 'subscribers.js'), renderAppSubscribersFile(appName));
-  await writeFile(path.join(appRoot, 'routes.js'), renderAppRoutes(appName));
-  await writeFile(path.join(appRoot, 'tests', 'models.test.js'), renderAppModelTest(appName));
-  await writeFile(path.join(appRoot, 'tests', 'validators.test.js'), renderAppValidatorTest(appName));
-  await writeFile(path.join(appRoot, 'tests', 'services.test.js'), renderAppServiceTest(appName));
-  await writeFile(path.join(appRoot, 'tests', 'routes.test.js'), renderAppRoutesTest(appName));
-}
+  detectSettingsMode,
+  ensureAppScaffold,
+  readAppsConfig,
+  updateAppRegistry,
+  updateProjectRoutesFile,
+} from '../utils/apps.js';
 
 export async function createApp({ appName, projectRoot, mount }) {
   ensureValidName(appName, 'app');
 
   const resolvedRoot = await resolveProjectRoot(projectRoot);
-
   const settingsMode = await detectSettingsMode(resolvedRoot);
   const normalizedMount = normalizeMountPath(mount || `/${appName}`);
   const existingApps = await readAppsConfig(settingsMode);
 
   if (existingApps.some((entry) => entry.name === appName)) {
-    throw new Error(`App \"${appName}\" already exists in project settings`);
+    throw new Error(`App "${appName}" already exists in project settings`);
   }
 
-  const updatedApps = [...existingApps, { name: appName, mount: normalizedMount }];
-
-  await createScaffold(resolvedRoot, appName);
-  await updateAppRegistry(resolvedRoot, updatedApps, settingsMode);
+  await ensureAppScaffold(resolvedRoot, appName);
+  await updateAppRegistry(resolvedRoot, [...existingApps, { name: appName, mount: normalizedMount }], settingsMode);
   await updateProjectRoutesFile(resolvedRoot, appName, normalizedMount);
 
-  console.log(`App \"${appName}\" created at ${path.join(resolvedRoot, 'apps', appName)}`);
+  console.log(`App "${appName}" created at ${resolvedRoot}/apps/${appName}`);
 }

package/src/cli/commands/doctor.js

@@ -1,7 +1,9 @@
 import fs from 'fs/promises';
 import path from 'path';
 import { loadProjectConfig } from '../../runtime/config.js';
+import { ensureValidName } from '../utils/fs.js';
 import { resolveProjectRoot } from '../utils/project.js';
+import { getAppScaffoldEntries, toImportName } from '../utils/apps.js';
 
 function createCollector() {
   const entries = [];
@@ -26,25 +28,47 @@ async function fileExists(filePath) {
   }
 }
 
-async function runAppChecks(rootDir, config, collector) {
+function escapeRegExp(value) {
+  return String(value).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+async function runAppChecks(rootDir, config, collector, targetAppName = null) {
   const apps = Array.isArray(config.apps) ? config.apps : [];
+  const declaredApps = new Map();
+
+  for (const app of apps) {
+    const appName = app?.name;
+    if (typeof appName === 'string' && appName.trim().length > 0) {
+      declaredApps.set(appName, app);
+    }
+  }
 
-  if (apps.length === 0) {
+  if (!targetAppName && apps.length === 0) {
     collector.warn('No apps declared in settings.apps.');
     return;
   }
 
-  collector.ok(`Declared apps: ${apps.map((app) => app.name).join(', ')}`);
+  if (!targetAppName) {
+    collector.ok(`Declared apps: ${apps.map((app) => app.name).join(', ')}`);
+  }
 
-  for (const app of apps) {
-    const appName = app?.name;
+  const routesFile = path.join(rootDir, 'routes.js');
+  const routesFileExists = await fileExists(routesFile);
+  const routesContent = routesFileExists ? await fs.readFile(routesFile, 'utf8') : '';
+  const targetApps = targetAppName ? [targetAppName] : apps;
+
+  for (const appEntry of targetApps) {
+    const appName = targetAppName || appEntry?.name;
+    const app = targetAppName ? declaredApps.get(appName) || null : appEntry;
     const mount = app?.mount;
     if (typeof appName !== 'string' || appName.trim().length === 0) {
-      collector.error(`Invalid app entry: ${JSON.stringify(app)}`);
+      collector.error(`Invalid app entry: ${JSON.stringify(appEntry)}`);
       continue;
     }
 
-    if (typeof mount !== 'string' || !mount.startsWith('/')) {
+    if (!app) {
+      collector.warn(`App "${appName}" is not declared in settings.apps.`);
+    } else if (typeof mount !== 'string' || !mount.startsWith('/')) {
       collector.error(`App "${appName}" has invalid mount "${String(mount)}" (must start with /).`);
     }
 
@@ -55,17 +79,37 @@ async function runAppChecks(rootDir, config, collector) {
       continue;
     }
 
-    const requiredFiles = ['routes.js', 'views.js', 'services.js', 'models.js', 'validators.js'];
-    for (const fileName of requiredFiles) {
-      const target = path.join(appRoot, fileName);
+    for (const entry of getAppScaffoldEntries(appName)) {
+      const target = path.join(rootDir, entry.target);
       if (!(await fileExists(target))) {
-        collector.warn(`App "${appName}" missing ${fileName}.`);
+        collector.warn(`App "${appName}" missing ${path.relative(appRoot, target)}.`);
       }
     }
 
-    const subscribersFile = path.join(appRoot, 'subscribers.js');
-    if (!(await fileExists(subscribersFile))) {
-      collector.warn(`App "${appName}" missing subscribers.js.`);
+    if (!app) {
+      continue;
+    }
+
+    if (config.autoMountApps === true) {
+      collector.ok(`App "${appName}" will be mounted automatically from settings.apps.`);
+      continue;
+    }
+
+    if (!routesFileExists) {
+      collector.warn(`Project routes.js is missing; app "${appName}" cannot be mounted centrally.`);
+      continue;
+    }
+
+    const importPath = `./apps/${appName}/routes.js`;
+    const importName = toImportName(appName);
+    const routePattern = new RegExp(`route\\.use\\([^\\n]*,\\s*${escapeRegExp(importName)}\\s*\\);`);
+
+    if (!routesContent.includes(importPath)) {
+      collector.warn(`Project routes.js is missing import for app "${appName}".`);
+    }
+
+    if (!routePattern.test(routesContent)) {
+      collector.warn(`Project routes.js is missing route.use(...) mount for app "${appName}".`);
     }
   }
 }
@@ -193,7 +237,12 @@ export async function runDoctor({
   projectRoot,
   failOnError = true,
   output = console,
+  appName = null,
 } = {}) {
+  if (appName) {
+    ensureValidName(appName, 'app');
+  }
+
   const resolvedRoot = await resolveProjectRoot(projectRoot || process.cwd());
   const collector = createCollector();
 
@@ -202,12 +251,17 @@ export async function runDoctor({
   const config = await loadProjectConfig(resolvedRoot);
   collector.ok(`Environment: ${config.env || 'development'}`);
 
-  await runAppChecks(resolvedRoot, config, collector);
-  await runStartupEntryChecks(resolvedRoot, config, collector);
-  runSecurityChecks(config, collector);
-  runAuthChecks(config, collector);
-  runApiChecks(config, collector);
-  await runTemplateChecks(resolvedRoot, config, collector);
+  if (appName) {
+    collector.ok(`Doctor scope: app "${appName}"`);
+    await runAppChecks(resolvedRoot, config, collector, appName);
+  } else {
+    await runAppChecks(resolvedRoot, config, collector);
+    await runStartupEntryChecks(resolvedRoot, config, collector);
+    runSecurityChecks(config, collector);
+    runAuthChecks(config, collector);
+    runApiChecks(config, collector);
+    await runTemplateChecks(resolvedRoot, config, collector);
+  }
 
   const summary = printSummary(collector.entries, output);
 

package/src/cli/commands/fixapp.js

@@ -0,0 +1,65 @@
+import path from 'path';
+import { ensureValidName, normalizeMountPath } from '../utils/fs.js';
+import { resolveProjectRoot } from '../utils/project.js';
+import {
+  detectSettingsMode,
+  ensureAppScaffold,
+  readAppsConfig,
+  updateAppRegistry,
+  updateProjectRoutesFile,
+} from '../utils/apps.js';
+
+export async function runFixApp({ appName, projectRoot, mount } = {}) {
+  if (!appName) {
+    throw new Error('Missing app name. Usage: aegisnode fix --app <app-name>');
+  }
+
+  ensureValidName(appName, 'app');
+
+  const resolvedRoot = await resolveProjectRoot(projectRoot || process.cwd());
+  const settingsMode = await detectSettingsMode(resolvedRoot);
+  const existingApps = await readAppsConfig(settingsMode);
+  const existingApp = existingApps.find((entry) => entry.name === appName) || null;
+  const appMount = existingApp?.mount || normalizeMountPath(mount || `/${appName}`);
+
+  const scaffoldResult = await ensureAppScaffold(resolvedRoot, appName, { overwrite: false });
+
+  let registryUpdated = false;
+  if (!existingApp) {
+    await updateAppRegistry(
+      resolvedRoot,
+      [...existingApps, { name: appName, mount: appMount }],
+      settingsMode,
+    );
+    registryUpdated = true;
+  }
+
+  const routesResult = await updateProjectRoutesFile(resolvedRoot, appName, appMount);
+  const relativeWritten = scaffoldResult.written.map((target) => path.relative(resolvedRoot, target));
+
+  if (relativeWritten.length === 0 && !registryUpdated && !routesResult.updatedImport && !routesResult.updatedRoute) {
+    console.log(`App "${appName}" is already complete.`);
+  } else {
+    console.log(`App "${appName}" repaired at ${resolvedRoot}/apps/${appName}`);
+    if (relativeWritten.length > 0) {
+      console.log(`Created missing files: ${relativeWritten.join(', ')}`);
+    }
+    if (registryUpdated) {
+      console.log(`Added app "${appName}" to settings.apps with mount ${appMount}`);
+    }
+    if (routesResult.updatedImport || routesResult.updatedRoute) {
+      console.log(`Updated routes.js registration for app "${appName}"`);
+    }
+  }
+
+  return {
+    rootDir: resolvedRoot,
+    appName,
+    mount: appMount,
+    createdFiles: scaffoldResult.written,
+    skippedFiles: scaffoldResult.skipped,
+    registryUpdated,
+    routesUpdated: routesResult.updatedImport || routesResult.updatedRoute,
+    routesFile: routesResult.routesFile,
+  };
+}

package/src/cli/index.js

@@ -5,6 +5,7 @@ import { generateArtifact } from './commands/generate.js';
 import { runDoctor } from './commands/doctor.js';
 import { runUpdateDependencies } from './commands/updatedeps.js';
 import { runGenerateLoader } from './commands/generateloader.js';
+import { runFixApp } from './commands/fixapp.js';
 
 function printHelp() {
   console.log(`AegisNode CLI
@@ -12,10 +13,11 @@ function printHelp() {
 Usage:
   aegisnode startproject <project-name>
   aegisnode createapp <app-name> [--project <path>] [--mount </path>]
+  aegisnode fix [--app <app-name>] [--project <path>]
   aegisnode generate <type> <name> --app <app-name> [--project <path>]
   aegisnode runserver [--project <path>] [--port <number>]
   aegisnode generateloader [--project <path>]
-  aegisnode doctor [--project <path>]
+  aegisnode doctor [--app <app-name>] [--project <path>]
   aegisnode updatedeps [--project <path>]
 
 Examples:
@@ -24,9 +26,11 @@ Examples:
   npm install
   aegisnode runserver
   aegisnode createapp users
+  aegisnode fix --app users
   aegisnode generate view user --app users
   aegisnode generate validator user --app users
   aegisnode generateloader --project blog
+  aegisnode doctor --app users --project blog
   aegisnode updatedeps --project blog
 `);
 }
@@ -123,8 +127,24 @@ export async function runCli(argv) {
     }
 
     case 'doctor': {
+      if (positional.length > 0) {
+        throw new Error('Doctor app target must use --app <app-name>. Usage: aegisnode doctor [--app <app-name>] [--project <path>]');
+      }
       await runDoctor({
         projectRoot: flags.project ? String(flags.project) : process.cwd(),
+        appName: flags.app ? String(flags.app) : null,
+      });
+      return;
+    }
+
+    case 'fix':
+    case 'fixapp': {
+      if (positional.length > 0) {
+        throw new Error('Fix app target must use --app <app-name>. Usage: aegisnode fix [--app <app-name>] [--project <path>]');
+      }
+      await runFixApp({
+        appName: flags.app ? String(flags.app) : undefined,
+        projectRoot: flags.project ? String(flags.project) : process.cwd(),
       });
       return;
     }

package/src/cli/utils/apps.js

@@ -0,0 +1,253 @@
+import fs from 'fs/promises';
+import path from 'path';
+import { pathToFileURL } from 'url';
+import { ensureDir, ensureValidName, exists, normalizeMountPath, writeFile } from './fs.js';
+import {
+  renderAppModelTest,
+  renderAppModelsFile,
+  renderAppRoutes,
+  renderAppRoutesTest,
+  renderAppServiceTest,
+  renderAppServicesFile,
+  renderAppSubscribersFile,
+  renderAppUtilsFile,
+  renderAppValidatorTest,
+  renderAppValidatorsFile,
+  renderAppViewsFile,
+  renderSettingsApps,
+} from './scaffolds.js';
+
+export const APPS_START = '// AEGIS_APPS_START';
+export const APPS_END = '// AEGIS_APPS_END';
+
+function renderAppEntries(apps) {
+  return apps
+    .map((app) => `    { name: ${JSON.stringify(app.name)}, mount: ${JSON.stringify(app.mount)} },`)
+    .join('\n');
+}
+
+function escapeRegExp(value) {
+  return String(value).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+export function toImportName(appName) {
+  const safe = appName
+    .split(/[-_\s]+/)
+    .filter(Boolean)
+    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+    .join('');
+
+  if (!safe) {
+    return 'appRoutes';
+  }
+
+  return `${safe.charAt(0).toLowerCase()}${safe.slice(1)}`;
+}
+
+async function readDefaultExport(filePath) {
+  const moduleUrl = `${pathToFileURL(filePath).href}?t=${Date.now()}`;
+  const loaded = await import(moduleUrl);
+  return loaded?.default;
+}
+
+export async function detectSettingsMode(projectRoot) {
+  const single = path.join(projectRoot, 'settings.js');
+  const split = path.join(projectRoot, 'settings', 'apps.js');
+
+  if (await exists(single)) {
+    return { mode: 'single', file: single };
+  }
+
+  if (await exists(split)) {
+    return { mode: 'split', file: split };
+  }
+
+  throw new Error(`Not an AegisNode project root: missing ${single} (or legacy ${split})`);
+}
+
+export async function readAppsConfig(settingsMode) {
+  const normalizeApp = (entry) => {
+    if (!entry || typeof entry !== 'object' || typeof entry.name !== 'string') {
+      return null;
+    }
+
+    ensureValidName(entry.name, 'app');
+    return {
+      name: entry.name,
+      mount: normalizeMountPath(entry.mount || `/${entry.name}`),
+    };
+  };
+
+  if (settingsMode.mode === 'single') {
+    const settings = await readDefaultExport(settingsMode.file);
+    const apps = settings?.apps;
+
+    if (!Array.isArray(apps)) {
+      throw new Error(`settings.js must export { apps: [] }. File: ${settingsMode.file}`);
+    }
+
+    return apps.map(normalizeApp).filter(Boolean);
+  }
+
+  const apps = await readDefaultExport(settingsMode.file);
+  if (!Array.isArray(apps)) {
+    throw new Error(`settings/apps.js must export an array. File: ${settingsMode.file}`);
+  }
+
+  return apps.map(normalizeApp).filter(Boolean);
+}
+
+async function updateSingleSettingsApps(settingsFile, apps) {
+  const current = await fs.readFile(settingsFile, 'utf8');
+
+  if (!current.includes(APPS_START) || !current.includes(APPS_END)) {
+    throw new Error(`settings.js is missing ${APPS_START}/${APPS_END} markers: ${settingsFile}`);
+  }
+
+  const replacement = `${APPS_START}\n${renderAppEntries(apps)}\n    ${APPS_END}`;
+  const updated = current.replace(/\/\/ AEGIS_APPS_START[\s\S]*?\/\/ AEGIS_APPS_END/m, replacement);
+
+  await writeFile(settingsFile, updated);
+}
+
+export async function updateAppRegistry(projectRoot, apps, settingsMode) {
+  if (settingsMode.mode === 'single') {
+    await updateSingleSettingsApps(settingsMode.file, apps);
+    return;
+  }
+
+  await writeFile(path.join(projectRoot, 'settings', 'apps.js'), renderSettingsApps(apps));
+}
+
+export function getAppScaffoldEntries(appName) {
+  const appRoot = path.join('apps', appName);
+  return [
+    {
+      target: path.join(appRoot, 'views.js'),
+      content: renderAppViewsFile(appName),
+    },
+    {
+      target: path.join(appRoot, 'models.js'),
+      content: renderAppModelsFile(appName),
+    },
+    {
+      target: path.join(appRoot, 'validators.js'),
+      content: renderAppValidatorsFile(appName),
+    },
+    {
+      target: path.join(appRoot, 'services.js'),
+      content: renderAppServicesFile(appName),
+    },
+    {
+      target: path.join(appRoot, 'utils.js'),
+      content: renderAppUtilsFile(),
+    },
+    {
+      target: path.join(appRoot, 'subscribers.js'),
+      content: renderAppSubscribersFile(appName),
+    },
+    {
+      target: path.join(appRoot, 'routes.js'),
+      content: renderAppRoutes(appName),
+    },
+    {
+      target: path.join(appRoot, 'tests', 'models.test.js'),
+      content: renderAppModelTest(appName),
+    },
+    {
+      target: path.join(appRoot, 'tests', 'validators.test.js'),
+      content: renderAppValidatorTest(appName),
+    },
+    {
+      target: path.join(appRoot, 'tests', 'services.test.js'),
+      content: renderAppServiceTest(appName),
+    },
+    {
+      target: path.join(appRoot, 'tests', 'routes.test.js'),
+      content: renderAppRoutesTest(appName),
+    },
+  ];
+}
+
+export async function ensureAppScaffold(projectRoot, appName, { overwrite = false } = {}) {
+  ensureValidName(appName, 'app');
+
+  const appRoot = path.join(projectRoot, 'apps', appName);
+  await ensureDir(appRoot);
+  await ensureDir(path.join(appRoot, 'tests'));
+
+  const written = [];
+  const skipped = [];
+
+  for (const entry of getAppScaffoldEntries(appName)) {
+    const target = path.join(projectRoot, entry.target);
+    if (!overwrite && await exists(target)) {
+      skipped.push(target);
+      continue;
+    }
+
+    await writeFile(target, entry.content);
+    written.push(target);
+  }
+
+  return {
+    appRoot,
+    written,
+    skipped,
+  };
+}
+
+export async function updateProjectRoutesFile(projectRoot, appName, mountPath) {
+  const routesFile = path.join(projectRoot, 'routes.js');
+  if (!(await exists(routesFile))) {
+    // Keep backward compatibility for legacy projects that still use routes/index.js.
+    return {
+      routesFile,
+      updatedImport: false,
+      updatedRoute: false,
+      skipped: true,
+    };
+  }
+
+  const importName = toImportName(appName);
+  const importLine = `import ${importName} from './apps/${appName}/routes.js';`;
+  const routeLine = `    route.use(${JSON.stringify(mountPath)}, ${importName});`;
+  const routePattern = new RegExp(`route\\.use\\([^\\n]*,\\s*${escapeRegExp(importName)}\\s*\\);`);
+
+  let content = await fs.readFile(routesFile, 'utf8');
+  let updatedImport = false;
+  let updatedRoute = false;
+
+  if (!content.includes(importLine)) {
+    if (content.includes('// AEGIS_APP_IMPORTS_START') && content.includes('// AEGIS_APP_IMPORTS_END')) {
+      content = content.replace('// AEGIS_APP_IMPORTS_END', `${importLine}\n// AEGIS_APP_IMPORTS_END`);
+    } else {
+      content = `${importLine}\n${content}`;
+    }
+    updatedImport = true;
+  }
+
+  if (!routePattern.test(content)) {
+    if (content.includes('// AEGIS_PROJECT_APP_ROUTES_START') && content.includes('// AEGIS_PROJECT_APP_ROUTES_END')) {
+      content = content.replace('    // AEGIS_PROJECT_APP_ROUTES_END', `${routeLine}\n    // AEGIS_PROJECT_APP_ROUTES_END`);
+      updatedRoute = true;
+    } else {
+      const match = content.match(/register\s*\([^)]*\)\s*{[\s\S]*?\n\s*}/m);
+      if (match) {
+        content = content.replace(match[0], `${match[0]}\n${routeLine}`);
+        updatedRoute = true;
+      }
+    }
+  }
+
+  if (updatedImport || updatedRoute) {
+    await writeFile(routesFile, content);
+  }
+
+  return {
+    routesFile,
+    updatedImport,
+    updatedRoute,
+    skipped: false,
+  };
+}

package/src/cli/utils/scaffolds.js

@@ -403,6 +403,19 @@ export default {
 `;
 }
 
+export function renderAppUtilsFile() {
+  return `/**
+ * App-local pure utilities.
+ *
+ * Use this file for small reusable functions that belong only to this app.
+ * Keep database access in models, business workflows in services, and request
+ * validation/sanitization in validators.
+ */
+
+export {};
+`;
+}
+
 export function renderAppSubscribersFile(appName) {
   return `export default function register${toPascalCase(appName)}Subscribers({ events, logger }) {
   events.subscribe('app.booted', ({ appName }) => {