@omnifyjp/omnify 5.8.3 → 5.8.5

package/omnify-config-schema.json

@@ -474,6 +474,11 @@
           "type": "boolean",
           "default": false,
           "description": "Drop the `Base/` (or `OmnifyBase/`) subfolder + `*Base*` class suffix. Base lives at `path` with class name `<Schema>` (models) or `<Schema><Layer>` (service / resource / etc.). Editable stub extends the bare base FQN. Recommended when `path` already isolates generated code (e.g. `app/Omnify/Models/`). Issue #96, v5.4+."
+        },
+        "userEditableGroupByFolder": {
+          "type": "boolean",
+          "default": false,
+          "description": "Mirror the schema's group folder onto the USER-EDITABLE layer's path + namespace (issue #98 v5.8.5). Default false — Laravel-canonical flat editable (e.g. `app/Models/User.php`, `App\\Models\\User`); group is encoded only in the base layer + the `use ... as Base` import. Set true to restore v5.8.x grouped editable shape (e.g. `app/Models/Auth/User.php`, `App\\Models\\Auth\\User`). Per layer."
         }
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/omnify",
-  "version": "5.8.3",
+  "version": "5.8.5",
   "description": "Schema-driven code generation for Laravel, TypeScript, and SQL",
   "license": "MIT",
   "repository": {
@@ -36,10 +36,10 @@
     "zod": "^3.24.0"
   },
   "optionalDependencies": {
-    "@omnifyjp/omnify-darwin-arm64": "5.8.3",
-    "@omnifyjp/omnify-darwin-x64": "5.8.3",
-    "@omnifyjp/omnify-linux-x64": "5.8.3",
-    "@omnifyjp/omnify-linux-arm64": "5.8.3",
-    "@omnifyjp/omnify-win32-x64": "5.8.3"
+    "@omnifyjp/omnify-darwin-arm64": "5.8.5",
+    "@omnifyjp/omnify-darwin-x64": "5.8.5",
+    "@omnifyjp/omnify-linux-x64": "5.8.5",
+    "@omnifyjp/omnify-linux-arm64": "5.8.5",
+    "@omnifyjp/omnify-win32-x64": "5.8.5"
   }
 }

package/ts-dist/php/controller-generator.js

@@ -26,11 +26,28 @@ function generateBaseController(name, schema, reader, config) {
     const lookup = api.lookup ?? true;
     const bulkDelete = api.bulkDelete ?? false;
     const restore = api.restore ?? (schema.options?.softDelete ?? false);
-    const baseNs = resolveModularBaseNamespace(config, name, 'Controllers', config.controllers.baseNamespace);
-    const modelNs = config.models.namespace;
-    const serviceBaseNs = resolveModularBaseNamespace(config, name, 'Services', config.services.baseNamespace);
-    const requestNs = config.requests.namespace;
-    const resourceNs = config.resources.namespace;
+    // Issue #98 v5.8.4 / v5.8.5: cross-layer imports must mirror where
+    // the imported file actually lives. BASE layers (Models, Services
+    // base, Controllers base) are ALWAYS group-nested in legacy structure.
+    // EDITABLE layers (Requests, Resources) are nested only when the
+    // target layer's `userEditableGroupByFolder` is `true` — Laravel-
+    // canonical defaults to flat. Modular structure already isolates
+    // per-schema so all paths skip group nesting.
+    const groupNestBase = (ns) => config.structure === 'modular'
+        ? ns
+        : nestByGroup({ path: '', namespace: ns }, schema.group).namespace;
+    const groupNestEditable = (ns, layer) => config.structure === 'modular'
+        ? ns
+        : (layer.userEditableGroupByFolder ? nestByGroup({ path: '', namespace: ns }, schema.group).namespace : ns);
+    const baseNs = config.structure === 'modular'
+        ? resolveModularBaseNamespace(config, name, 'Controllers', config.controllers.baseNamespace)
+        : groupNestBase(config.controllers.baseNamespace);
+    const modelNs = groupNestBase(config.models.namespace);
+    const serviceBaseNs = config.structure === 'modular'
+        ? resolveModularBaseNamespace(config, name, 'Services', config.services.baseNamespace)
+        : groupNestBase(config.services.baseNamespace);
+    const requestNs = groupNestEditable(config.requests.namespace, config.requests);
+    const resourceNs = groupNestEditable(config.resources.namespace, config.resources);
     // Build imports
     const imports = [
         `use App\\Http\\Controllers\\Controller;`,

package/ts-dist/php/factory-generator.js

@@ -3,7 +3,7 @@
  */
 import { toPascalCase } from './naming-helper.js';
 import { toFaker, compoundFaker, associationFaker } from './faker-mapper.js';
-import { userFile } from './types.js';
+import { userFile, nestByGroup } from './types.js';
 /** Generate Factory classes for all project-owned visible object schemas. */
 export function generateFactories(reader, config) {
     const files = [];
@@ -17,7 +17,14 @@ export function generateFactories(reader, config) {
 }
 function generateFactory(name, schema, reader, schemas, config) {
     const modelName = toPascalCase(name);
-    const modelNamespace = config.models.namespace;
+    // Issue #98 v5.8.4: legacy structure groups Models by folder, so the
+    // factory's `use ${modelNamespace}\\${modelName}` import must include
+    // the schema's group too — otherwise the factory references a flat
+    // path that no longer holds the model file. Modular structure
+    // already isolates per-schema so it skips the nesting.
+    const modelNamespace = config.structure === 'modular'
+        ? config.models.namespace
+        : nestByGroup({ path: '', namespace: config.models.namespace }, schema.group).namespace;
     const factoryNamespace = config.factories.namespace;
     const properties = (schema.properties ?? {});
     const expandedProperties = reader.getExpandedProperties(name);

package/ts-dist/php/model-generator.js

@@ -4,7 +4,7 @@
 import { toPascalCase, toSnakeCase, toCamelCase, pluralize } from './naming-helper.js';
 import { toCast, toPhpDocType, isHiddenByDefault } from './type-mapper.js';
 import { buildRelation } from './relation-builder.js';
-import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveSharedBaseNamespace, resolveGlobalTraitNamespace, resolveGlobalEnumNamespace, resolveBaseClass, resolveEditableClass, nestByGroup, } from './types.js';
+import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveSharedBaseNamespace, resolveGlobalTraitNamespace, resolveGlobalEnumNamespace, resolveBaseClass, resolveEditableClass, nestByGroup, nestEditableByGroup, } from './types.js';
 import { enumClassName } from './enum-generator.js';
 /** Generate base model and user model for all project-owned object schemas,
  *  plus user models for package schemas (extending the package model). */
@@ -42,6 +42,13 @@ function generateBaseModel(name, schema, reader, config) {
     // below) is the PARENT class string (BaseModel / Authenticatable).
     // Issue #98 v5.8+: apply group-by-folder nesting in legacy structure
     // so 100+ schemas produce a navigable tree mirroring schemas/<group>/.
+    // v5.8.5: pivot schemas (`kind: pivot`) override group → all pivot
+    // models live under a dedicated `Pivot/` subfolder regardless of the
+    // YAML group, mirroring the dedicated `Translation/` subfolder. Devs
+    // rarely interact with pivot models directly (Eloquent uses them
+    // implicitly), so consolidating them keeps the main model namespace
+    // clean.
+    const isPivot = schema.kind === 'pivot';
     let baseDescriptor;
     let baseNamespace;
     if (config.structure === 'modular') {
@@ -54,7 +61,9 @@ function generateBaseModel(name, schema, reader, config) {
     }
     else {
         const raw = resolveBaseClass(config.models, modelName, 'BaseModel');
-        const nested = nestByGroup({ path: raw.path, namespace: raw.fqn.substring(0, raw.fqn.lastIndexOf('\\')) }, schema.group);
+        const nested = isPivot
+            ? { path: `${raw.path}/Pivot`, namespace: `${raw.fqn.substring(0, raw.fqn.lastIndexOf('\\'))}\\Pivot` }
+            : nestByGroup({ path: raw.path, namespace: raw.fqn.substring(0, raw.fqn.lastIndexOf('\\')) }, schema.group);
         baseDescriptor = { className: raw.className, path: nested.path, fqn: `${nested.namespace}\\${raw.className}` };
         baseNamespace = nested.namespace;
     }
@@ -102,7 +111,7 @@ function generateBaseModel(name, schema, reader, config) {
     const hidden = buildHidden(properties, expandedProperties, propertyOrder);
     const appends = buildAppends(expandedProperties);
     const casts = buildCasts(properties, expandedProperties, propertyOrder, reader, config);
-    const relations = buildRelations(name, properties, propertyOrder, modelNamespace, reader);
+    const relations = buildRelations(name, properties, propertyOrder, modelNamespace, reader, config);
     const accessors = buildAccessors(expandedProperties);
     const fileAccessors = hasFiles ? buildFileAccessors(properties, propertyOrder, modelNamespace) : '';
     const auditSection = buildAuditSection(options, reader, modelNamespace);
@@ -221,7 +230,11 @@ function generateUserModel(name, schema, config, hasNestedSet = false) {
     // than the base (e.g. `app/Models/<Name>.php` while base is at
     // `app/Omnify/Models/<Name>.php`). resolveEditableClass +
     // resolveBaseClass keep the extends-clause + use-import in sync.
-    // Issue #98 v5.8+: same group-by-folder nesting on the editable side.
+    // Issue #98 v5.8.5: pivot schemas always nest under `Pivot/` on
+    // both base AND editable sides regardless of `userEditableGroupByFolder`.
+    // Pivots are infrastructure — keeping them out of the main namespace
+    // mirrors how Laravel devs treat `Illuminate\Database\Eloquent\Relations\Pivot`.
+    const isPivot = schema.kind === 'pivot';
     let editable;
     let base;
     if (config.structure === 'modular') {
@@ -230,10 +243,14 @@ function generateUserModel(name, schema, config, hasNestedSet = false) {
     }
     else {
         const editRaw = resolveEditableClass(config.models, modelName);
-        const editNested = nestByGroup({ path: editRaw.path, namespace: editRaw.namespace }, schema.group);
+        const editNested = isPivot
+            ? { path: `${editRaw.path}/Pivot`, namespace: `${editRaw.namespace}\\Pivot` }
+            : nestEditableByGroup(config.models, { path: editRaw.path, namespace: editRaw.namespace }, schema.group);
         editable = { className: editRaw.className, fileName: editRaw.fileName, namespace: editNested.namespace, path: editNested.path, fqn: `${editNested.namespace}\\${editRaw.className}` };
         const baseRaw = resolveBaseClass(config.models, modelName, 'BaseModel');
-        const baseNs = nestByGroup({ path: baseRaw.path, namespace: baseRaw.fqn.substring(0, baseRaw.fqn.lastIndexOf('\\')) }, schema.group).namespace;
+        const baseNs = isPivot
+            ? `${baseRaw.fqn.substring(0, baseRaw.fqn.lastIndexOf('\\'))}\\Pivot`
+            : nestByGroup({ path: baseRaw.path, namespace: baseRaw.fqn.substring(0, baseRaw.fqn.lastIndexOf('\\')) }, schema.group).namespace;
         base = { className: baseRaw.className, fqn: `${baseNs}\\${baseRaw.className}` };
     }
     const factoryNamespace = config.factories.namespace;
@@ -561,7 +578,42 @@ function buildCasts(properties, expandedProperties, propertyOrder, reader, confi
         return '';
     return casts.map(c => `            ${c}`).join('\n') + '\n';
 }
-function buildRelations(schemaName, properties, propertyOrder, modelNamespace, reader) {
+/**
+ * Issue #98 v5.8.6: resolve the FQCN namespace of a related Model
+ * for inline `belongsTo / hasMany / belongsToMany / morphTo` references.
+ * The namespace must match the TARGET's actual file location, not the
+ * source schema's. Three knobs:
+ *   1. Package schemas — return the package's namespace verbatim
+ *      (already handled by reader.resolveModelNamespace).
+ *   2. Pivot schemas — always nest under `Pivot/` regardless of any
+ *      group / userEditableGroupByFolder setting.
+ *   3. Group nesting — only when `userEditableGroupByFolder: true`
+ *      (matches where the editable lives so the relation resolves to
+ *      the user's customizable class). Default off → flat FQCN
+ *      matches the Laravel-canonical flat editable layout.
+ *
+ * Pre-fix every relation emitted `\${modelNamespace}\${target}::class`
+ * (flat FQCN) regardless of where the target's file actually lived.
+ * For grouped projects this dispatched to a non-existent class at
+ * runtime — `ErrorException: include(... no such file)`.
+ */
+function resolveRelatedModelNamespace(target, modelNamespace, config, reader) {
+    const baseNs = reader.resolveModelNamespace(target, modelNamespace);
+    // Package schemas — leave as-is.
+    if (baseNs !== modelNamespace)
+        return baseNs;
+    const targetSchema = reader.getSchema(target);
+    if (!targetSchema)
+        return baseNs;
+    if (targetSchema.kind === 'pivot') {
+        return `${baseNs}\\Pivot`;
+    }
+    if (config.models.userEditableGroupByFolder && targetSchema.group) {
+        return `${baseNs}\\${toPascalCase(targetSchema.group)}`;
+    }
+    return baseNs;
+}
+function buildRelations(schemaName, properties, propertyOrder, modelNamespace, reader, config) {
     const methods = [];
     const sourceTableName = reader.getTableName(schemaName);
     // Track method names already declared on this model so reverse-relation
@@ -574,9 +626,11 @@ function buildRelations(schemaName, properties, propertyOrder, modelNamespace, r
         const prop = properties[propName];
         if (!prop || prop['type'] !== 'Association')
             continue;
-        // Resolve namespace per-target (package schemas use their own namespace)
+        // Resolve namespace per-target (package schemas use their own namespace).
+        // Issue #98 v5.8.6: also nest by target's group / Pivot/ so the
+        // FQCN matches the target file's actual location.
         const target = prop['target'] ?? '';
-        const ns = target ? reader.resolveModelNamespace(target, modelNamespace) : modelNamespace;
+        const ns = target ? resolveRelatedModelNamespace(target, modelNamespace, config, reader) : modelNamespace;
         const targetTableName = target ? reader.getTableName(target) : '';
         // For ManyToMany, look up the explicit `kind: pivot` schema (the
         // sorted PascalCase concat of source + target — auto-created on
@@ -606,7 +660,7 @@ function buildRelations(schemaName, properties, propertyOrder, modelNamespace, r
     // Auto-generate reverse HasMany/HasOne for any child schema that declares a
     // ManyToOne/OneToOne pointing at this schema, unless the user has already
     // declared a relation method with the same name. Issue #39.
-    const inverseRelations = buildInverseRelations(schemaName, modelNamespace, reader, declaredMethods, explicitInverses);
+    const inverseRelations = buildInverseRelations(schemaName, modelNamespace, reader, declaredMethods, explicitInverses, config);
     if (inverseRelations) {
         methods.push(inverseRelations);
     }
@@ -649,7 +703,7 @@ const LARAVEL_RESERVED_RELATION_NAMES = new Set([
  * a unique method name, or add `mappedBy: <customName>` to the child schema
  * so the derived method name changes.
  */
-function buildInverseRelations(parentName, modelNamespace, reader, declaredMethods, explicitInverses) {
+function buildInverseRelations(parentName, modelNamespace, reader, declaredMethods, explicitInverses, config) {
     const methods = [];
     const allSchemas = reader.getSchemas();
     // Stable iteration order — sort child names so output is deterministic
@@ -697,7 +751,11 @@ function buildInverseRelations(parentName, modelNamespace, reader, declaredMetho
             // Here we're emitting the *parent* accessor, so the child's ManyToOne
             // (or owning OneToOne) is what we react to.
             const fkColumn = `${toSnakeCase(childPropName)}_id`;
-            const childNs = reader.resolveModelNamespace(childName, modelNamespace);
+            // Issue #98 v5.8.6: nest the inverse-side FQCN by the CHILD's
+            // group / Pivot/ so the relation resolves to the child's actual
+            // file location (which lives in `<childGroup>/<Child>.php` or
+            // `Pivot/<Child>.php`, not flat).
+            const childNs = resolveRelatedModelNamespace(childName, modelNamespace, config, reader);
             const fqcn = `\\${childNs}\\${childName}`;
             const returnType = isOneToOne ? 'HasOne' : 'HasMany';
             const eloquentMethod = isOneToOne ? 'hasOne' : 'hasMany';

package/ts-dist/php/policy-generator.js

@@ -5,7 +5,7 @@
  * Only generates for schemas that have `policies` defined.
  */
 import { toPascalCase, toSnakeCase, toCamelCase } from './naming-helper.js';
-import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveBaseClass, resolveEditableClass, nestByGroup } from './types.js';
+import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveBaseClass, resolveEditableClass, nestByGroup, nestEditableByGroup } from './types.js';
 // ============================================================================
 // Action mapping: Omnify → Laravel
 // ============================================================================
@@ -46,7 +46,13 @@ function generateForSchema(name, schema, reader, config) {
 function generateBasePolicyClass(name, schema, reader, config) {
     const modelName = toPascalCase(name);
     const baseNamespace = resolveModularBaseNamespace(config, name, 'Policies', config.policies.baseNamespace);
-    const modelNamespace = config.models.namespace;
+    // Issue #98 v5.8.4: legacy structure groups Models by folder. The
+    // policy's `use ${modelNamespace}\\${modelName}` import must include
+    // the schema's group too, otherwise the policy fails to autoload at
+    // runtime when Laravel resolves it from the gate registration.
+    const modelNamespace = config.structure === 'modular'
+        ? config.models.namespace
+        : nestByGroup({ path: '', namespace: config.models.namespace }, schema.group).namespace;
     const policies = schema.policies;
     const hasSoftDelete = schema.options?.softDelete ?? false;
     const needsCidrHelper = policiesUseCidr(policies);
@@ -122,7 +128,7 @@ function generateUserPolicyClass(name, schema, config) {
         const baseNs = nestByGroup({ path: baseRaw.path, namespace: baseRaw.fqn.substring(0, baseRaw.fqn.lastIndexOf('\\')) }, schema.group).namespace;
         baseDescriptor = { className: baseRaw.className, fqn: `${baseNs}\\${baseRaw.className}` };
         const editRaw = resolveEditableClass(config.policies, modelName, 'Policy');
-        const editNested = nestByGroup({ path: editRaw.path, namespace: editRaw.namespace }, schema.group);
+        const editNested = nestEditableByGroup(config.policies, { path: editRaw.path, namespace: editRaw.namespace }, schema.group);
         editable = { className: editRaw.className, fileName: editRaw.fileName, namespace: editNested.namespace, path: editNested.path };
     }
     // Issue #98: alias on class-name collision (flatBase + userEditablePath).

package/ts-dist/php/request-generator.js

@@ -3,7 +3,7 @@
  */
 import { toPascalCase, toSnakeCase, toCamelCase } from './naming-helper.js';
 import { toStoreRules, toUpdateRules, formatRules, hasRuleObject } from './type-mapper.js';
-import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveBaseClass, resolveEditableClass, nestByGroup } from './types.js';
+import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveBaseClass, resolveEditableClass, nestByGroup, nestEditableByGroup } from './types.js';
 /**
  * Resolve the Laravel validation rule type ('integer', 'uuid', or 'string') for
  * a foreign key column based on the target schema's primary key type.
@@ -294,7 +294,7 @@ function generateUserRequest(name, schema, config, action) {
         const baseNs = nestByGroup({ path: baseRaw.path, namespace: baseRaw.fqn.substring(0, baseRaw.fqn.lastIndexOf('\\')) }, schema.group).namespace;
         baseDescriptor = { className: baseRaw.className, fqn: `${baseNs}\\${baseRaw.className}` };
         const editRaw = resolveEditableClass(config.requests, modelName, `${action}Request`);
-        const editNested = nestByGroup({ path: editRaw.path, namespace: editRaw.namespace }, schema.group);
+        const editNested = nestEditableByGroup(config.requests, { path: editRaw.path, namespace: editRaw.namespace }, schema.group);
         editable = { className: editRaw.className, fileName: editRaw.fileName, namespace: editNested.namespace, path: editNested.path };
     }
     // Issue #98: alias on class-name collision (flatBase + userEditablePath).

package/ts-dist/php/resource-generator.js

@@ -3,7 +3,7 @@
  */
 import { toPascalCase, toSnakeCase, toCamelCase } from './naming-helper.js';
 import { isHiddenByDefault, toResourceExpression } from './type-mapper.js';
-import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveBaseClass, resolveEditableClass, nestByGroup } from './types.js';
+import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveBaseClass, resolveEditableClass, nestByGroup, nestEditableByGroup } from './types.js';
 /** Generate Resource classes for all project-owned visible object schemas. */
 export function generateResources(reader, config) {
     const files = [];
@@ -158,7 +158,7 @@ function generateUserResource(name, schema, config) {
         const baseNs = nestByGroup({ path: baseRaw.path, namespace: baseRaw.fqn.substring(0, baseRaw.fqn.lastIndexOf('\\')) }, schema.group).namespace;
         baseDescriptor = { className: baseRaw.className, fqn: `${baseNs}\\${baseRaw.className}` };
         const editRaw = resolveEditableClass(config.resources, modelName, 'Resource');
-        const editNested = nestByGroup({ path: editRaw.path, namespace: editRaw.namespace }, schema.group);
+        const editNested = nestEditableByGroup(config.resources, { path: editRaw.path, namespace: editRaw.namespace }, schema.group);
         editable = { className: editRaw.className, fileName: editRaw.fileName, namespace: editNested.namespace, path: editNested.path };
     }
     // Issue #98: alias on class-name collision (flatBase + userEditablePath).

package/ts-dist/php/schema-config-generator.js

@@ -5,7 +5,7 @@
  * Only includes properties that have searchable/filterable/sortable flags.
  */
 import { toPascalCase, toSnakeCase } from './naming-helper.js';
-import { baseFile } from './types.js';
+import { baseFile, nestByGroup } from './types.js';
 /** Generate the omnify-schemas config file. */
 export function generateSchemaConfig(reader, config) {
     const apiSchemas = reader.getSchemasWithApi();
@@ -64,9 +64,16 @@ function generateSchemaEntry(name, schema, reader, config) {
     const propsBlock = propLines.length > 0
         ? `\n        'properties' => [\n${propLines.join('\n')}\n        ],`
         : `\n        'properties' => [],`;
+    // Issue #98 v5.8.4: Query Engine resolves `model` via reflection, so
+    // the FQN must reflect the actual file location (which now includes
+    // the schema's group folder for legacy structure). Modular structure
+    // already isolates per-schema so it skips the nesting.
+    const modelNs = config.structure === 'modular'
+        ? config.models.namespace
+        : nestByGroup({ path: '', namespace: config.models.namespace }, schema.group).namespace;
     return `    '${modelName}' => [
         'table' => '${tableName}',
-        'model' => \\${config.models.namespace}\\${modelName}::class,
+        'model' => \\${modelNs}\\${modelName}::class,
         'softDelete' => ${softDelete ? 'true' : 'false'},
         'perPage' => ${perPage},${propsBlock}
     ],

package/ts-dist/php/service-generator.js

@@ -13,7 +13,7 @@
  * eagerCount}` keys are deprecated and emit warnings at generate time.
  */
 import { toPascalCase, toSnakeCase } from './naming-helper.js';
-import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveBaseClass, resolveEditableClass, nestByGroup } from './types.js';
+import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveBaseClass, resolveEditableClass, nestByGroup, nestEditableByGroup } from './types.js';
 // ============================================================================
 // Public entry point
 // ============================================================================
@@ -510,7 +510,15 @@ function generateBaseService(name, schema, reader, config) {
     const baseNs = config.structure === 'modular'
         ? resolveModularBaseNamespace(config, name, 'Services', config.services.baseNamespace)
         : nestByGroup({ path: '', namespace: config.services.baseNamespace }, schema.group).namespace;
-    const modelNs = config.models.namespace;
+    // Issue #98 v5.8.4: cross-layer Model imports must include the
+    // schema's group folder so they resolve to where Models actually
+    // live now. Pre-fix the service base emitted
+    // `use App\Omnify\Models\Banner;` while the model file was at
+    // `app/Omnify/Models/Cms/Banner.php` — autoload failed at runtime
+    // for every consumer (TypeError + missing-file include).
+    const modelNs = config.structure === 'modular'
+        ? config.models.namespace
+        : nestByGroup({ path: '', namespace: config.models.namespace }, schema.group).namespace;
     // Build imports
     const imports = [
         `use ${modelNs}\\${modelName};`,
@@ -1784,7 +1792,7 @@ function generateUserService(name, schema, config) {
         const baseNs = nestByGroup({ path: baseRaw.path, namespace: baseRaw.fqn.substring(0, baseRaw.fqn.lastIndexOf('\\')) }, schema.group).namespace;
         baseDescriptor = { className: baseRaw.className, fqn: `${baseNs}\\${baseRaw.className}` };
         const editRaw = resolveEditableClass(config.services, modelName, 'Service');
-        const editNested = nestByGroup({ path: editRaw.path, namespace: editRaw.namespace }, schema.group);
+        const editNested = nestEditableByGroup(config.services, { path: editRaw.path, namespace: editRaw.namespace }, schema.group);
         editable = { className: editRaw.className, fileName: editRaw.fileName, namespace: editNested.namespace, path: editNested.path };
     }
     // Group nesting already applied via nestByGroup above; no additional

package/ts-dist/php/service-provider-generator.js

@@ -2,15 +2,23 @@
  * Port of AppServiceProviderGenerator.php — generates OmnifyServiceProvider.
  */
 import { toPascalCase } from './naming-helper.js';
-import { baseFile } from './types.js';
+import { baseFile, nestByGroup } from './types.js';
 /** Generate the OmnifyServiceProvider for the application. */
 export function generateServiceProvider(reader, config) {
     const modelNamespace = config.models.namespace;
-    // Build morph map entries (project-owned schemas only)
+    // Build morph map entries (project-owned schemas only). Issue #98 v5.8.4:
+    // each schema's actual model FQN includes its group folder, so the
+    // morph map must echo that — pre-fix every entry pointed to the flat
+    // `App\Omnify\Models\<Name>::class` and Laravel's morphMap resolved to
+    // a non-existent class for every grouped schema, breaking polymorphic
+    // relationships project-wide.
     const morphEntries = [];
-    for (const name of Object.keys(reader.getProjectVisibleObjectSchemas())) {
+    for (const [name, schema] of Object.entries(reader.getProjectVisibleObjectSchemas())) {
         const modelName = toPascalCase(name);
-        morphEntries.push(`            '${modelName}' => \\${modelNamespace}\\${modelName}::class,`);
+        const ns = config.structure === 'modular'
+            ? modelNamespace
+            : nestByGroup({ path: '', namespace: modelNamespace }, schema.group).namespace;
+        morphEntries.push(`            '${modelName}' => \\${ns}\\${modelName}::class,`);
     }
     // Add File to morph map when any schema uses File type
     if (reader.hasFileProperties()) {

package/ts-dist/php/types.d.ts

@@ -113,6 +113,26 @@ export interface LaravelPathOverride {
      * isolates generated code (e.g. `app/Omnify/Models/`).
      */
     flatBase?: boolean;
+    /**
+     * Issue #98 v5.8.5: per-layer toggle for whether the USER-EDITABLE
+     * stub is grouped by the schema's parent folder. The base layer is
+     * always grouped (canonical layout — domain-organized regenerated
+     * code), but Laravel ecosystem code (`app/Models/`, `app/Services/`,
+     * `app/Http/Requests/`, `app/Http/Resources/`) is canonically FLAT —
+     * `App\Models\User`, not `App\Models\Auth\User`. `config/auth.php`,
+     * Sanctum traits, factory discovery and dozens of ecosystem packages
+     * assume the flat shape.
+     *
+     * Default: `false` (Laravel-canonical flat editable). The grouped
+     * base + flat editable layout is what new `composer create-project
+     * laravel/laravel` apps produce, and the use-statement in the editable
+     * stub still aliases the GROUPED base FQN — group is encoded in the
+     * `use ... as ...Base` import, not the editable's namespace.
+     *
+     * Projects that adopted v5.8.x and want to keep their grouped editable
+     * layout flip this to `true` per layer.
+     */
+    userEditableGroupByFolder?: boolean;
 }
 /** Nested set package configuration. */
 export interface NestedSetOverride {
@@ -225,6 +245,15 @@ export interface BaseEditableLayer {
      * extends `\{namespace}\{Schema}` (no `BaseModel` indirection). Issue #96.
      */
     flatBase: boolean;
+    /**
+     * Issue #98 v5.8.5: when `true`, the user-editable layer is also
+     * grouped by the schema's parent folder (mirrors the base layer).
+     * Default `false` — Laravel-canonical flat layout (`app/Models/User.php`,
+     * not `app/Models/Auth/User.php`). Group is encoded only in the base
+     * layer + the `use ... as Base` import inside the editable stub.
+     * The base layer is unaffected — it is always grouped.
+     */
+    userEditableGroupByFolder: boolean;
 }
 /** PHP codegen configuration (resolved with defaults). */
 export interface PhpConfig {
@@ -347,6 +376,21 @@ export declare function resolveEditableClass(layer: BaseEditableLayer, schemaNam
     path: string;
     fqn: string;
 };
+/**
+ * Issue #98 v5.8.5: gate group nesting for the user-editable layer on
+ * `layer.userEditableGroupByFolder`. Default flat (Laravel-canonical) —
+ * `app/Models/User.php`, `App\Models\User`. Opt-in to mirror-base via
+ * `userEditableGroupByFolder: true` per layer. Auxiliary subfolders
+ * (Translation/, Pivot/, Enum/) are imposed elsewhere and are NOT
+ * affected by this flag — they always nest.
+ */
+export declare function nestEditableByGroup(layer: BaseEditableLayer, loc: {
+    path: string;
+    namespace: string;
+}, group: string | undefined): {
+    path: string;
+    namespace: string;
+};
 /**
  * Derive full PHP config from optional overrides.
  * All paths and namespaces fall back to sensible defaults.

package/ts-dist/php/types.js

@@ -197,7 +197,11 @@ nsFromPath) {
         : path;
     const userEditableNamespace = override?.userEditableNamespace
         ?? (override?.userEditablePath ? nsFromPath(userEditablePath) : namespace);
-    return { namespace, baseNamespace, path, basePath, userEditablePath, userEditableNamespace, flatBase };
+    // Issue #98 v5.8.5: the user-editable layer is FLAT (Laravel-canonical)
+    // by default. Project explicitly opts back into the v5.8.x grouped
+    // editable shape via `userEditableGroupByFolder: true` per layer.
+    const userEditableGroupByFolder = override?.userEditableGroupByFolder ?? false;
+    return { namespace, baseNamespace, path, basePath, userEditablePath, userEditableNamespace, flatBase, userEditableGroupByFolder };
 }
 /**
  * Class-name + file-name resolver for the BASE class of a layer. Returns
@@ -234,6 +238,19 @@ export function resolveEditableClass(layer, schemaName, classSuffix = '') {
         fqn: `${layer.userEditableNamespace}\\${className}`,
     };
 }
+/**
+ * Issue #98 v5.8.5: gate group nesting for the user-editable layer on
+ * `layer.userEditableGroupByFolder`. Default flat (Laravel-canonical) —
+ * `app/Models/User.php`, `App\Models\User`. Opt-in to mirror-base via
+ * `userEditableGroupByFolder: true` per layer. Auxiliary subfolders
+ * (Translation/, Pivot/, Enum/) are imposed elsewhere and are NOT
+ * affected by this flag — they always nest.
+ */
+export function nestEditableByGroup(layer, loc, group) {
+    if (!layer.userEditableGroupByFolder)
+        return loc;
+    return nestByGroup(loc, group);
+}
 // Default paths.
 //
 // Hybrid projects (manual team code + Omnify codegen) need Omnify-generated

package/types/config.d.ts

@@ -68,6 +68,16 @@ export interface CodegenLaravelPathConfig {
    * generated code (e.g. `app/Omnify/Models/`). Issue #96, v5.4+.
    */
   flatBase?: boolean;
+  /**
+   * Issue #98 v5.8.5: when `true`, the user-editable layer's path +
+   * namespace mirrors the schema's group folder (e.g.
+   * `app/Models/Auth/User.php`, namespace `App\Models\Auth`). Default
+   * `false` — Laravel-canonical FLAT layout (`app/Models/User.php`,
+   * namespace `App\Models`); group is encoded only in the base layer
+   * and the `use ... as Base` import inside the editable stub. Per
+   * layer (model / service / request / resource / policy / controller).
+   */
+  userEditableGroupByFolder?: boolean;
 }
 
 /** Nested set package configuration. */