@memberjunction/cli 5.5.0 → 5.6.0

package/oclif.manifest.json

@@ -424,68 +424,38 @@
         "index.js"
       ]
     },
-    "codegen:5-0-fix-entity-names": {
+    "dbdoc:analyze": {
       "aliases": [],
       "args": {},
-      "description": "[v5.0 Migration] Scan TypeScript files for entity names AND class names that need updating.\n\nThree strategies are applied:\n  1. Class name renames (regex) — ActionEntity -> MJActionEntity, ActionSchema -> MJActionSchema,\n     ActionEntityExtended -> MJActionEntityExtended (extended subclasses),\n     ActionEntityServerEntity -> MJActionEntityServer (server subclass suffix standardization),\n     ActionFormComponentExtended -> MJActionFormComponentExtended (Angular form components).\n     Explicit subclass mappings (57 entries from subclass-rename-map.json) take priority over\n     auto-generated suffix rules, enabling suffix changes (e.g., _Server -> Server, ServerEntity -> Server).\n  2. Multi-word entity name renames (regex) — 'AI Models' -> 'MJ: AI Models'\n  3. Single-word entity name renames (AST) — 'Actions' -> 'MJ: Actions' in GetEntityObject, OpenEntityRecord,\n     navigateToEntity, EntityName: assignments, .Name === comparisons, @RegisterClass decorators.\n\nThe rename map (272 entity entries + 57 subclass entries) is built from entity_subclasses.ts @RegisterClass\ndecorators plus embedded rename maps. Runs in dry-run mode by default; use --fix to apply.",
+      "description": "Analyze database and generate documentation (delegates to db-auto-doc analyze)",
       "examples": [
-        {
-          "description": "Dry-run scan of the packages directory",
-          "command": "<%= config.bin %> <%= command.id %> --path packages/"
-        },
-        {
-          "description": "Scan a single file",
-          "command": "<%= config.bin %> <%= command.id %> --path packages/Angular/Explorer/dashboards/src/Actions/components/actions-overview.component.ts"
-        },
-        {
-          "description": "Apply fixes across the codebase",
-          "command": "<%= config.bin %> <%= command.id %> --path packages/ --fix"
-        },
-        {
-          "description": "Quiet mode (summary only)",
-          "command": "<%= config.bin %> <%= command.id %> --path packages/ -q"
-        }
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> --resume ./output/run-6/state.json",
+        "<%= config.bin %> <%= command.id %> --config ./my-config.json"
       ],
       "flags": {
-        "path": {
-          "char": "p",
-          "description": "File or directory to scan. Accepts a single .ts file or a directory (scanned recursively). Defaults to the current working directory.",
-          "name": "path",
+        "resume": {
+          "char": "r",
+          "description": "Resume from an existing state file",
+          "name": "resume",
+          "required": false,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "fix": {
-          "description": "Apply fixes in place. Without this flag, the command runs in dry-run mode and only reports findings.",
-          "name": "fix",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "entity-subclasses": {
-          "description": "Explicit path to entity_subclasses.ts for building the rename map. If omitted, the tool searches common locations relative to the target path.",
-          "name": "entity-subclasses",
+        "config": {
+          "char": "c",
+          "description": "Path to config file",
+          "name": "config",
+          "default": "./config.json",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        },
-        "quiet": {
-          "char": "q",
-          "description": "Suppress detailed per-file output; only show the final summary counts.",
-          "name": "quiet",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "verbose": {
-          "char": "v",
-          "description": "Show detailed progress including each file being scanned.",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "codegen:5-0-fix-entity-names",
+      "id": "dbdoc:analyze",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -495,72 +465,105 @@
       "relativePath": [
         "dist",
         "commands",
-        "codegen",
-        "5-0-fix-entity-names.js"
+        "dbdoc",
+        "analyze.js"
       ]
     },
-    "codegen:5-0-fix-html-entity-names": {
+    "dbdoc:export-sample-queries": {
       "aliases": [],
       "args": {},
-      "description": "[v5.0 Migration] Scan Angular HTML template files for hardcoded entity names that need \"MJ: \" prefix updates.\n\nUses targeted regex patterns to find entity name references in template expressions\nand attribute values. Detects method calls like navigateToEntity('Actions'),\nOpenEntityRecord('Entities', id), and attribute values like RowsEntityName=\"Users\".\nRuns in dry-run mode by default; use --fix to apply.\n\nThe rename map is built dynamically from entity_subclasses.ts by parsing all\n@RegisterClass(BaseEntity, 'MJ: XYZ') decorators (~272 entries).",
+      "description": "Export sample queries to MemberJunction metadata format (delegates to db-auto-doc export-sample-queries)",
       "examples": [
-        {
-          "description": "Dry-run scan of Angular templates",
-          "command": "<%= config.bin %> <%= command.id %> --path packages/Angular/"
-        },
-        {
-          "description": "Apply fixes to HTML templates",
-          "command": "<%= config.bin %> <%= command.id %> --path packages/Angular/ --fix"
-        },
-        {
-          "description": "Scan with verbose output",
-          "command": "<%= config.bin %> <%= command.id %> --path packages/ -v"
-        },
-        {
-          "description": "Scan a single template file",
-          "command": "<%= config.bin %> <%= command.id %> --path packages/Angular/Explorer/dashboards/src/Actions/actions-dashboard.component.html"
-        }
+        "<%= config.bin %> <%= command.id %> --input ./output/sample-queries.json --output ./metadata/queries/.queries.json",
+        "<%= config.bin %> <%= command.id %> --input ./sample-queries.json --output ./metadata/queries/.queries.json --separate-sql-files",
+        "<%= config.bin %> <%= command.id %> --input ./sample-queries.json --output ./queries/.queries.json --category \"Database Documentation\"",
+        "<%= config.bin %> <%= command.id %> --input ./sample-queries.json --output ./queries/.queries.json --status Pending --min-confidence 0.8"
       ],
       "flags": {
-        "path": {
-          "char": "p",
-          "description": "File or directory to scan. Accepts a single .html file or a directory (scanned recursively). Defaults to the current working directory.",
-          "name": "path",
+        "input": {
+          "char": "i",
+          "description": "Path to sample-queries.json file generated by generate-queries command",
+          "name": "input",
+          "required": true,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "fix": {
-          "description": "Apply fixes in place. Without this flag, the command runs in dry-run mode and only reports findings.",
-          "name": "fix",
+        "output": {
+          "char": "o",
+          "description": "Output path for the .queries.json metadata file",
+          "name": "output",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "separate-sql-files": {
+          "description": "Write SQL to separate files and use @file: references",
+          "name": "separate-sql-files",
           "allowNo": false,
           "type": "boolean"
         },
-        "entity-subclasses": {
-          "description": "Explicit path to entity_subclasses.ts for building the rename map. If omitted, the tool searches common locations relative to the target path.",
-          "name": "entity-subclasses",
+        "sql-dir": {
+          "description": "Directory for SQL files when using --separate-sql-files (relative to output file)",
+          "name": "sql-dir",
+          "default": "SQL",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "quiet": {
-          "char": "q",
-          "description": "Suppress detailed per-file output; only show the final summary counts.",
-          "name": "quiet",
+        "category": {
+          "description": "Category name for @lookup reference (e.g., \"Database Documentation\")",
+          "name": "category",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "status": {
+          "description": "Status to assign to exported queries",
+          "name": "status",
+          "default": "Pending",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "Approved",
+            "Pending",
+            "Rejected",
+            "Expired"
+          ],
+          "type": "option"
+        },
+        "min-confidence": {
+          "description": "Minimum confidence threshold to export (0-1)",
+          "name": "min-confidence",
+          "default": "0",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "validated-only": {
+          "description": "Only export queries that were successfully validated",
+          "name": "validated-only",
           "allowNo": false,
           "type": "boolean"
         },
-        "verbose": {
-          "char": "v",
-          "description": "Show detailed progress including each file being scanned.",
-          "name": "verbose",
+        "append": {
+          "description": "Append to existing metadata file instead of overwriting",
+          "name": "append",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "include-primary-key": {
+          "description": "Include primaryKey and sync fields (for updating existing records)",
+          "name": "include-primary-key",
           "allowNo": false,
           "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "codegen:5-0-fix-html-entity-names",
+      "id": "dbdoc:export-sample-queries",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -570,110 +573,100 @@
       "relativePath": [
         "dist",
         "commands",
-        "codegen",
-        "5-0-fix-html-entity-names.js"
+        "dbdoc",
+        "export-sample-queries.js"
       ]
     },
-    "codegen:5-0-fix-metadata-names": {
+    "dbdoc:export": {
       "aliases": [],
       "args": {},
-      "description": "[v5.0 Migration] Scan metadata JSON files for entity names that need \"MJ: \" prefix updates.\n\nTargets the metadata/ directory used by \"mj sync\". Detects entity name references in\n@lookup: directives (both the entity name and lookup value), .mj-sync.json and\n.mj-folder.json config files (entity/entityName fields), relatedEntities object keys,\nand fields.Name values in Entities-managing folders. Runs in dry-run mode by default;\nuse --fix to apply.\n\nThe rename map is built dynamically from entity_subclasses.ts by parsing all\n@RegisterClass(BaseEntity, 'MJ: XYZ') decorators (~272 entries).",
+      "description": "Export documentation in multiple formats (delegates to db-auto-doc export)",
       "examples": [
-        {
-          "description": "Dry-run scan of the metadata directory",
-          "command": "<%= config.bin %> <%= command.id %> --path metadata/"
-        },
-        {
-          "description": "Apply fixes to metadata files",
-          "command": "<%= config.bin %> <%= command.id %> --path metadata/ --fix"
-        },
-        {
-          "description": "Scan a specific subdirectory",
-          "command": "<%= config.bin %> <%= command.id %> --path metadata/resource-types"
-        },
-        {
-          "description": "Scan and fix a single metadata file",
-          "command": "<%= config.bin %> <%= command.id %> --path metadata/entities/.audit-related-entities.json --fix"
-        }
+        "<%= config.bin %> <%= command.id %> --state-file=./db-doc-state.json",
+        "<%= config.bin %> <%= command.id %> --sql",
+        "<%= config.bin %> <%= command.id %> --markdown",
+        "<%= config.bin %> <%= command.id %> --html",
+        "<%= config.bin %> <%= command.id %> --csv",
+        "<%= config.bin %> <%= command.id %> --mermaid",
+        "<%= config.bin %> <%= command.id %> --sql --markdown --html --csv --mermaid --apply"
       ],
       "flags": {
-        "path": {
-          "char": "p",
-          "description": "File or directory to scan. Accepts a single .json file or a directory (scanned recursively, including dotfiles like .mj-sync.json). Defaults to the current working directory.",
-          "name": "path",
+        "state-file": {
+          "char": "s",
+          "description": "Path to state JSON file",
+          "name": "state-file",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "fix": {
-          "description": "Apply fixes in place. Without this flag, the command runs in dry-run mode and only reports findings.",
-          "name": "fix",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "entity-subclasses": {
-          "description": "Explicit path to entity_subclasses.ts for building the rename map. If omitted, the tool searches common locations relative to the target path.",
-          "name": "entity-subclasses",
+        "output-dir": {
+          "char": "o",
+          "description": "Output directory for generated files",
+          "name": "output-dir",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "quiet": {
-          "char": "q",
-          "description": "Suppress detailed per-file output; only show the final summary counts.",
-          "name": "quiet",
+        "sql": {
+          "description": "Generate SQL script",
+          "name": "sql",
           "allowNo": false,
           "type": "boolean"
         },
-        "verbose": {
-          "char": "v",
-          "description": "Show detailed progress including each file being scanned.",
-          "name": "verbose",
+        "markdown": {
+          "description": "Generate Markdown documentation",
+          "name": "markdown",
           "allowNo": false,
           "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "codegen:5-0-fix-metadata-names",
-      "pluginAlias": "@memberjunction/cli",
-      "pluginName": "@memberjunction/cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "codegen",
-        "5-0-fix-metadata-names.js"
-      ]
-    },
-    "codegen": {
-      "aliases": [],
-      "args": {},
-      "description": "Run the full MemberJunction code generation pipeline.\n\nAnalyzes your SQL Server database schema, updates MemberJunction metadata, and\ngenerates synchronized code across the entire stack:\n\n  - SQL views, stored procedures, indexes, and permissions\n  - TypeScript entity classes with Zod validation schemas\n  - Angular form components with AI-driven layouts\n  - GraphQL resolvers and type definitions\n  - Action subclasses and DB schema JSON\n\nConfiguration is loaded from mj.config.cjs in the current directory (or parent\ndirectories). Database connection can also be set via environment variables:\nDB_HOST, DB_DATABASE, CODEGEN_DB_USERNAME, CODEGEN_DB_PASSWORD.\n\nUse --skipdb to skip all database operations (metadata sync, SQL object\ngeneration) and only regenerate TypeScript, Angular, and GraphQL output from\nexisting metadata.",
-      "examples": [
-        {
-          "command": "<%= config.bin %> <%= command.id %>",
-          "description": "Run the full code generation pipeline"
         },
-        {
-          "command": "<%= config.bin %> <%= command.id %> --skipdb",
-          "description": "Regenerate code files without touching the database"
-        }
-      ],
-      "flags": {
-        "skipdb": {
-          "description": "Skip database operations (metadata sync, SQL generation). Only regenerate TypeScript entities, Angular components, and GraphQL resolvers from existing metadata.",
-          "name": "skipdb",
+        "html": {
+          "description": "Generate interactive HTML documentation",
+          "name": "html",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "csv": {
+          "description": "Generate CSV exports (tables and columns)",
+          "name": "csv",
           "allowNo": false,
           "type": "boolean"
+        },
+        "mermaid": {
+          "description": "Generate Mermaid ERD diagram files",
+          "name": "mermaid",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "report": {
+          "description": "Generate analysis report",
+          "name": "report",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "apply": {
+          "description": "Apply SQL to database",
+          "name": "apply",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "approved-only": {
+          "description": "Only export approved items",
+          "name": "approved-only",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "confidence-threshold": {
+          "description": "Minimum confidence threshold",
+          "name": "confidence-threshold",
+          "default": "0",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "codegen",
+      "id": "dbdoc:export",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -683,84 +676,65 @@
       "relativePath": [
         "dist",
         "commands",
-        "codegen",
-        "index.js"
+        "dbdoc",
+        "export.js"
       ]
     },
-    "codegen:manifest": {
+    "dbdoc:generate-queries": {
       "aliases": [],
       "args": {},
-      "description": "Generate a class registration manifest to prevent tree-shaking.\n\nMemberJunction uses @RegisterClass decorators with a dynamic class factory.\nModern bundlers (ESBuild, Vite) cannot detect dynamic instantiation and will\ntree-shake these classes out of production builds. This command scans the\ndependency tree for all @RegisterClass-decorated classes and emits a manifest\nfile with static imports that the bundler cannot eliminate.\n\nTypically used as a prebuild/prestart script for MJAPI and MJExplorer. For\nMJ distribution users, pre-built manifests ship inside @memberjunction/server-bootstrap\nand @memberjunction/ng-bootstrap -- use --exclude-packages @memberjunction to\ngenerate a supplemental manifest covering only your own application classes.",
+      "description": "Generate sample SQL queries from existing analysis state (delegates to db-auto-doc generate-queries)",
       "examples": [
-        {
-          "command": "<%= config.bin %> <%= command.id %>",
-          "description": "Generate manifest with default output path"
-        },
-        {
-          "command": "<%= config.bin %> <%= command.id %> --appDir ./packages/MJAPI --output ./packages/MJAPI/src/generated/class-registrations-manifest.ts",
-          "description": "Generate manifest for a specific application directory"
-        },
-        {
-          "command": "<%= config.bin %> <%= command.id %> --exclude-packages @memberjunction",
-          "description": "Exclude MJ packages (use pre-built bootstrap manifests instead)"
-        },
-        {
-          "command": "<%= config.bin %> <%= command.id %> --filter BaseEngine --filter BaseAction --verbose",
-          "description": "Only include specific base classes with detailed progress"
-        }
+        "<%= config.bin %> <%= command.id %> --from-state ./output/run-1/state.json",
+        "<%= config.bin %> <%= command.id %> --from-state ./output/run-1/state.json --output-dir ./queries",
+        "<%= config.bin %> <%= command.id %> --from-state ./output/run-1/state.json --queries-per-table 10"
       ],
       "flags": {
-        "output": {
-          "char": "o",
-          "description": "Output file path for the generated manifest. The file will contain named imports and a CLASS_REGISTRATIONS array.",
-          "name": "output",
-          "default": "./src/generated/class-registrations-manifest.ts",
+        "from-state": {
+          "description": "Path to existing state.json file from previous analysis",
+          "name": "from-state",
+          "required": true,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "appDir": {
-          "char": "a",
-          "description": "Root directory of the application whose package.json dependency tree will be scanned. Defaults to the current working directory.",
-          "name": "appDir",
+        "output-dir": {
+          "description": "Output directory for generated queries",
+          "name": "output-dir",
+          "required": false,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "filter": {
-          "char": "f",
-          "description": "Only include classes extending this base class. Can be repeated (e.g., --filter BaseEngine --filter BaseAction).",
-          "name": "filter",
+        "config": {
+          "char": "c",
+          "description": "Path to config file (for database connection and AI settings)",
+          "name": "config",
+          "default": "./config.json",
           "hasDynamicHelp": false,
-          "multiple": true,
+          "multiple": false,
           "type": "option"
         },
-        "exclude-packages": {
-          "char": "e",
-          "description": "Skip packages whose name starts with this prefix. Useful for excluding @memberjunction packages when using pre-built bootstrap manifests. Can be repeated.",
-          "name": "exclude-packages",
+        "queries-per-table": {
+          "description": "Number of queries to generate per table",
+          "name": "queries-per-table",
+          "required": false,
           "hasDynamicHelp": false,
-          "multiple": true,
+          "multiple": false,
           "type": "option"
         },
-        "quiet": {
-          "char": "q",
-          "description": "Suppress all output except errors.",
-          "name": "quiet",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "verbose": {
-          "char": "v",
-          "description": "Show detailed progress including per-package scanning info and skipped classes.",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
+        "max-execution-time": {
+          "description": "Maximum execution time for query validation (ms)",
+          "name": "max-execution-time",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "codegen:manifest",
+      "id": "dbdoc:generate-queries",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -770,42 +744,43 @@
       "relativePath": [
         "dist",
         "commands",
-        "codegen",
-        "manifest.js"
+        "dbdoc",
+        "generate-queries.js"
       ]
     },
-    "dbdoc:analyze": {
+    "dbdoc": {
       "aliases": [],
       "args": {},
-      "description": "Analyze database and generate documentation (delegates to db-auto-doc analyze)",
+      "description": "AI-powered database documentation generator",
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hidden": false,
+      "hiddenAliases": [],
+      "id": "dbdoc",
+      "pluginAlias": "@memberjunction/cli",
+      "pluginName": "@memberjunction/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "dbdoc",
+        "index.js"
+      ]
+    },
+    "dbdoc:init": {
+      "aliases": [],
+      "args": {},
+      "description": "Initialize DBAutoDoc project (delegates to db-auto-doc init)",
       "examples": [
-        "<%= config.bin %> <%= command.id %>",
-        "<%= config.bin %> <%= command.id %> --resume ./output/run-6/state.json",
-        "<%= config.bin %> <%= command.id %> --config ./my-config.json"
+        "<%= config.bin %> <%= command.id %>"
       ],
-      "flags": {
-        "resume": {
-          "char": "r",
-          "description": "Resume from an existing state file",
-          "name": "resume",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "config": {
-          "char": "c",
-          "description": "Path to config file",
-          "name": "config",
-          "default": "./config.json",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
+      "flags": {},
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "dbdoc:analyze",
+      "id": "dbdoc:init",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -816,104 +791,29 @@
         "dist",
         "commands",
         "dbdoc",
-        "analyze.js"
+        "init.js"
       ]
     },
-    "dbdoc:export-sample-queries": {
+    "dbdoc:reset": {
       "aliases": [],
       "args": {},
-      "description": "Export sample queries to MemberJunction metadata format (delegates to db-auto-doc export-sample-queries)",
+      "description": "Reset analysis state (delegates to db-auto-doc reset)",
       "examples": [
-        "<%= config.bin %> <%= command.id %> --input ./output/sample-queries.json --output ./metadata/queries/.queries.json",
-        "<%= config.bin %> <%= command.id %> --input ./sample-queries.json --output ./metadata/queries/.queries.json --separate-sql-files",
-        "<%= config.bin %> <%= command.id %> --input ./sample-queries.json --output ./queries/.queries.json --category \"Database Documentation\"",
-        "<%= config.bin %> <%= command.id %> --input ./sample-queries.json --output ./queries/.queries.json --status Pending --min-confidence 0.8"
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> --force"
       ],
       "flags": {
-        "input": {
-          "char": "i",
-          "description": "Path to sample-queries.json file generated by generate-queries command",
-          "name": "input",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "output": {
-          "char": "o",
-          "description": "Output path for the .queries.json metadata file",
-          "name": "output",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "separate-sql-files": {
-          "description": "Write SQL to separate files and use @file: references",
-          "name": "separate-sql-files",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "sql-dir": {
-          "description": "Directory for SQL files when using --separate-sql-files (relative to output file)",
-          "name": "sql-dir",
-          "default": "SQL",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "category": {
-          "description": "Category name for @lookup reference (e.g., \"Database Documentation\")",
-          "name": "category",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "status": {
-          "description": "Status to assign to exported queries",
-          "name": "status",
-          "default": "Pending",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "Approved",
-            "Pending",
-            "Rejected",
-            "Expired"
-          ],
-          "type": "option"
-        },
-        "min-confidence": {
-          "description": "Minimum confidence threshold to export (0-1)",
-          "name": "min-confidence",
-          "default": "0",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "validated-only": {
-          "description": "Only export queries that were successfully validated",
-          "name": "validated-only",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "append": {
-          "description": "Append to existing metadata file instead of overwriting",
-          "name": "append",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "include-primary-key": {
-          "description": "Include primaryKey and sync fields (for updating existing records)",
-          "name": "include-primary-key",
+        "force": {
+          "char": "f",
+          "description": "Force reset without confirmation",
+          "name": "force",
           "allowNo": false,
           "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "dbdoc:export-sample-queries",
+      "id": "dbdoc:reset",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -924,21 +824,16 @@
         "dist",
         "commands",
         "dbdoc",
-        "export-sample-queries.js"
+        "reset.js"
       ]
     },
-    "dbdoc:export": {
+    "dbdoc:status": {
       "aliases": [],
       "args": {},
-      "description": "Export documentation in multiple formats (delegates to db-auto-doc export)",
+      "description": "Show analysis status and progress (delegates to db-auto-doc status)",
       "examples": [
-        "<%= config.bin %> <%= command.id %> --state-file=./db-doc-state.json",
-        "<%= config.bin %> <%= command.id %> --sql",
-        "<%= config.bin %> <%= command.id %> --markdown",
-        "<%= config.bin %> <%= command.id %> --html",
-        "<%= config.bin %> <%= command.id %> --csv",
-        "<%= config.bin %> <%= command.id %> --mermaid",
-        "<%= config.bin %> <%= command.id %> --sql --markdown --html --csv --mermaid --apply"
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> --state-file ./custom-state.json"
       ],
       "flags": {
         "state-file": {
@@ -948,75 +843,86 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "dbdoc:status",
+      "pluginAlias": "@memberjunction/cli",
+      "pluginName": "@memberjunction/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "dbdoc",
+        "status.js"
+      ]
+    },
+    "codegen:5-0-fix-entity-names": {
+      "aliases": [],
+      "args": {},
+      "description": "[v5.0 Migration] Scan TypeScript files for entity names AND class names that need updating.\n\nThree strategies are applied:\n  1. Class name renames (regex) — ActionEntity -> MJActionEntity, ActionSchema -> MJActionSchema,\n     ActionEntityExtended -> MJActionEntityExtended (extended subclasses),\n     ActionEntityServerEntity -> MJActionEntityServer (server subclass suffix standardization),\n     ActionFormComponentExtended -> MJActionFormComponentExtended (Angular form components).\n     Explicit subclass mappings (57 entries from subclass-rename-map.json) take priority over\n     auto-generated suffix rules, enabling suffix changes (e.g., _Server -> Server, ServerEntity -> Server).\n  2. Multi-word entity name renames (regex) — 'AI Models' -> 'MJ: AI Models'\n  3. Single-word entity name renames (AST) — 'Actions' -> 'MJ: Actions' in GetEntityObject, OpenEntityRecord,\n     navigateToEntity, EntityName: assignments, .Name === comparisons, @RegisterClass decorators.\n\nThe rename map (272 entity entries + 57 subclass entries) is built from entity_subclasses.ts @RegisterClass\ndecorators plus embedded rename maps. Runs in dry-run mode by default; use --fix to apply.",
+      "examples": [
+        {
+          "description": "Dry-run scan of the packages directory",
+          "command": "<%= config.bin %> <%= command.id %> --path packages/"
         },
-        "output-dir": {
-          "char": "o",
-          "description": "Output directory for generated files",
-          "name": "output-dir",
+        {
+          "description": "Scan a single file",
+          "command": "<%= config.bin %> <%= command.id %> --path packages/Angular/Explorer/dashboards/src/Actions/components/actions-overview.component.ts"
+        },
+        {
+          "description": "Apply fixes across the codebase",
+          "command": "<%= config.bin %> <%= command.id %> --path packages/ --fix"
+        },
+        {
+          "description": "Quiet mode (summary only)",
+          "command": "<%= config.bin %> <%= command.id %> --path packages/ -q"
+        }
+      ],
+      "flags": {
+        "path": {
+          "char": "p",
+          "description": "File or directory to scan. Accepts a single .ts file or a directory (scanned recursively). Defaults to the current working directory.",
+          "name": "path",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "sql": {
-          "description": "Generate SQL script",
-          "name": "sql",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "markdown": {
-          "description": "Generate Markdown documentation",
-          "name": "markdown",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "html": {
-          "description": "Generate interactive HTML documentation",
-          "name": "html",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "csv": {
-          "description": "Generate CSV exports (tables and columns)",
-          "name": "csv",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "mermaid": {
-          "description": "Generate Mermaid ERD diagram files",
-          "name": "mermaid",
+        "fix": {
+          "description": "Apply fixes in place. Without this flag, the command runs in dry-run mode and only reports findings.",
+          "name": "fix",
           "allowNo": false,
           "type": "boolean"
         },
-        "report": {
-          "description": "Generate analysis report",
-          "name": "report",
-          "allowNo": false,
-          "type": "boolean"
+        "entity-subclasses": {
+          "description": "Explicit path to entity_subclasses.ts for building the rename map. If omitted, the tool searches common locations relative to the target path.",
+          "name": "entity-subclasses",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         },
-        "apply": {
-          "description": "Apply SQL to database",
-          "name": "apply",
+        "quiet": {
+          "char": "q",
+          "description": "Suppress detailed per-file output; only show the final summary counts.",
+          "name": "quiet",
           "allowNo": false,
           "type": "boolean"
         },
-        "approved-only": {
-          "description": "Only export approved items",
-          "name": "approved-only",
+        "verbose": {
+          "char": "v",
+          "description": "Show detailed progress including each file being scanned.",
+          "name": "verbose",
           "allowNo": false,
           "type": "boolean"
-        },
-        "confidence-threshold": {
-          "description": "Minimum confidence threshold",
-          "name": "confidence-threshold",
-          "default": "0",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "dbdoc:export",
+      "id": "codegen:5-0-fix-entity-names",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -1026,65 +932,72 @@
       "relativePath": [
         "dist",
         "commands",
-        "dbdoc",
-        "export.js"
+        "codegen",
+        "5-0-fix-entity-names.js"
       ]
     },
-    "dbdoc:generate-queries": {
+    "codegen:5-0-fix-html-entity-names": {
       "aliases": [],
       "args": {},
-      "description": "Generate sample SQL queries from existing analysis state (delegates to db-auto-doc generate-queries)",
+      "description": "[v5.0 Migration] Scan Angular HTML template files for hardcoded entity names that need \"MJ: \" prefix updates.\n\nUses targeted regex patterns to find entity name references in template expressions\nand attribute values. Detects method calls like navigateToEntity('Actions'),\nOpenEntityRecord('Entities', id), and attribute values like RowsEntityName=\"Users\".\nRuns in dry-run mode by default; use --fix to apply.\n\nThe rename map is built dynamically from entity_subclasses.ts by parsing all\n@RegisterClass(BaseEntity, 'MJ: XYZ') decorators (~272 entries).",
       "examples": [
-        "<%= config.bin %> <%= command.id %> --from-state ./output/run-1/state.json",
-        "<%= config.bin %> <%= command.id %> --from-state ./output/run-1/state.json --output-dir ./queries",
-        "<%= config.bin %> <%= command.id %> --from-state ./output/run-1/state.json --queries-per-table 10"
+        {
+          "description": "Dry-run scan of Angular templates",
+          "command": "<%= config.bin %> <%= command.id %> --path packages/Angular/"
+        },
+        {
+          "description": "Apply fixes to HTML templates",
+          "command": "<%= config.bin %> <%= command.id %> --path packages/Angular/ --fix"
+        },
+        {
+          "description": "Scan with verbose output",
+          "command": "<%= config.bin %> <%= command.id %> --path packages/ -v"
+        },
+        {
+          "description": "Scan a single template file",
+          "command": "<%= config.bin %> <%= command.id %> --path packages/Angular/Explorer/dashboards/src/Actions/actions-dashboard.component.html"
+        }
       ],
       "flags": {
-        "from-state": {
-          "description": "Path to existing state.json file from previous analysis",
-          "name": "from-state",
-          "required": true,
+        "path": {
+          "char": "p",
+          "description": "File or directory to scan. Accepts a single .html file or a directory (scanned recursively). Defaults to the current working directory.",
+          "name": "path",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "output-dir": {
-          "description": "Output directory for generated queries",
-          "name": "output-dir",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "fix": {
+          "description": "Apply fixes in place. Without this flag, the command runs in dry-run mode and only reports findings.",
+          "name": "fix",
+          "allowNo": false,
+          "type": "boolean"
         },
-        "config": {
-          "char": "c",
-          "description": "Path to config file (for database connection and AI settings)",
-          "name": "config",
-          "default": "./config.json",
+        "entity-subclasses": {
+          "description": "Explicit path to entity_subclasses.ts for building the rename map. If omitted, the tool searches common locations relative to the target path.",
+          "name": "entity-subclasses",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "queries-per-table": {
-          "description": "Number of queries to generate per table",
-          "name": "queries-per-table",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "quiet": {
+          "char": "q",
+          "description": "Suppress detailed per-file output; only show the final summary counts.",
+          "name": "quiet",
+          "allowNo": false,
+          "type": "boolean"
         },
-        "max-execution-time": {
-          "description": "Maximum execution time for query validation (ms)",
-          "name": "max-execution-time",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "verbose": {
+          "char": "v",
+          "description": "Show detailed progress including each file being scanned.",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "dbdoc:generate-queries",
+      "id": "codegen:5-0-fix-html-entity-names",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -1094,19 +1007,72 @@
       "relativePath": [
         "dist",
         "commands",
-        "dbdoc",
-        "generate-queries.js"
+        "codegen",
+        "5-0-fix-html-entity-names.js"
       ]
     },
-    "dbdoc": {
+    "codegen:5-0-fix-metadata-names": {
       "aliases": [],
       "args": {},
-      "description": "AI-powered database documentation generator",
-      "flags": {},
+      "description": "[v5.0 Migration] Scan metadata JSON files for entity names that need \"MJ: \" prefix updates.\n\nTargets the metadata/ directory used by \"mj sync\". Detects entity name references in\n@lookup: directives (both the entity name and lookup value), .mj-sync.json and\n.mj-folder.json config files (entity/entityName fields), relatedEntities object keys,\nand fields.Name values in Entities-managing folders. Runs in dry-run mode by default;\nuse --fix to apply.\n\nThe rename map is built dynamically from entity_subclasses.ts by parsing all\n@RegisterClass(BaseEntity, 'MJ: XYZ') decorators (~272 entries).",
+      "examples": [
+        {
+          "description": "Dry-run scan of the metadata directory",
+          "command": "<%= config.bin %> <%= command.id %> --path metadata/"
+        },
+        {
+          "description": "Apply fixes to metadata files",
+          "command": "<%= config.bin %> <%= command.id %> --path metadata/ --fix"
+        },
+        {
+          "description": "Scan a specific subdirectory",
+          "command": "<%= config.bin %> <%= command.id %> --path metadata/resource-types"
+        },
+        {
+          "description": "Scan and fix a single metadata file",
+          "command": "<%= config.bin %> <%= command.id %> --path metadata/entities/.audit-related-entities.json --fix"
+        }
+      ],
+      "flags": {
+        "path": {
+          "char": "p",
+          "description": "File or directory to scan. Accepts a single .json file or a directory (scanned recursively, including dotfiles like .mj-sync.json). Defaults to the current working directory.",
+          "name": "path",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "fix": {
+          "description": "Apply fixes in place. Without this flag, the command runs in dry-run mode and only reports findings.",
+          "name": "fix",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "entity-subclasses": {
+          "description": "Explicit path to entity_subclasses.ts for building the rename map. If omitted, the tool searches common locations relative to the target path.",
+          "name": "entity-subclasses",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "quiet": {
+          "char": "q",
+          "description": "Suppress detailed per-file output; only show the final summary counts.",
+          "name": "quiet",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "verbose": {
+          "char": "v",
+          "description": "Show detailed progress including each file being scanned.",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
       "hasDynamicHelp": false,
-      "hidden": false,
       "hiddenAliases": [],
-      "id": "dbdoc",
+      "id": "codegen:5-0-fix-metadata-names",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -1116,21 +1082,35 @@
       "relativePath": [
         "dist",
         "commands",
-        "dbdoc",
-        "index.js"
+        "codegen",
+        "5-0-fix-metadata-names.js"
       ]
     },
-    "dbdoc:init": {
+    "codegen": {
       "aliases": [],
       "args": {},
-      "description": "Initialize DBAutoDoc project (delegates to db-auto-doc init)",
+      "description": "Run the full MemberJunction code generation pipeline.\n\nAnalyzes your SQL Server database schema, updates MemberJunction metadata, and\ngenerates synchronized code across the entire stack:\n\n  - SQL views, stored procedures, indexes, and permissions\n  - TypeScript entity classes with Zod validation schemas\n  - Angular form components with AI-driven layouts\n  - GraphQL resolvers and type definitions\n  - Action subclasses and DB schema JSON\n\nConfiguration is loaded from mj.config.cjs in the current directory (or parent\ndirectories). Database connection can also be set via environment variables:\nDB_HOST, DB_DATABASE, CODEGEN_DB_USERNAME, CODEGEN_DB_PASSWORD.\n\nUse --skipdb to skip all database operations (metadata sync, SQL object\ngeneration) and only regenerate TypeScript, Angular, and GraphQL output from\nexisting metadata.",
       "examples": [
-        "<%= config.bin %> <%= command.id %>"
+        {
+          "command": "<%= config.bin %> <%= command.id %>",
+          "description": "Run the full code generation pipeline"
+        },
+        {
+          "command": "<%= config.bin %> <%= command.id %> --skipdb",
+          "description": "Regenerate code files without touching the database"
+        }
       ],
-      "flags": {},
+      "flags": {
+        "skipdb": {
+          "description": "Skip database operations (metadata sync, SQL generation). Only regenerate TypeScript entities, Angular components, and GraphQL resolvers from existing metadata.",
+          "name": "skipdb",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "dbdoc:init",
+      "id": "codegen",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -1140,30 +1120,84 @@
       "relativePath": [
         "dist",
         "commands",
-        "dbdoc",
-        "init.js"
+        "codegen",
+        "index.js"
       ]
     },
-    "dbdoc:reset": {
+    "codegen:manifest": {
       "aliases": [],
       "args": {},
-      "description": "Reset analysis state (delegates to db-auto-doc reset)",
+      "description": "Generate a class registration manifest to prevent tree-shaking.\n\nMemberJunction uses @RegisterClass decorators with a dynamic class factory.\nModern bundlers (ESBuild, Vite) cannot detect dynamic instantiation and will\ntree-shake these classes out of production builds. This command scans the\ndependency tree for all @RegisterClass-decorated classes and emits a manifest\nfile with static imports that the bundler cannot eliminate.\n\nTypically used as a prebuild/prestart script for MJAPI and MJExplorer. For\nMJ distribution users, pre-built manifests ship inside @memberjunction/server-bootstrap\nand @memberjunction/ng-bootstrap -- use --exclude-packages @memberjunction to\ngenerate a supplemental manifest covering only your own application classes.",
       "examples": [
-        "<%= config.bin %> <%= command.id %>",
-        "<%= config.bin %> <%= command.id %> --force"
+        {
+          "command": "<%= config.bin %> <%= command.id %>",
+          "description": "Generate manifest with default output path"
+        },
+        {
+          "command": "<%= config.bin %> <%= command.id %> --appDir ./packages/MJAPI --output ./packages/MJAPI/src/generated/class-registrations-manifest.ts",
+          "description": "Generate manifest for a specific application directory"
+        },
+        {
+          "command": "<%= config.bin %> <%= command.id %> --exclude-packages @memberjunction",
+          "description": "Exclude MJ packages (use pre-built bootstrap manifests instead)"
+        },
+        {
+          "command": "<%= config.bin %> <%= command.id %> --filter BaseEngine --filter BaseAction --verbose",
+          "description": "Only include specific base classes with detailed progress"
+        }
       ],
       "flags": {
-        "force": {
+        "output": {
+          "char": "o",
+          "description": "Output file path for the generated manifest. The file will contain named imports and a CLASS_REGISTRATIONS array.",
+          "name": "output",
+          "default": "./src/generated/class-registrations-manifest.ts",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "appDir": {
+          "char": "a",
+          "description": "Root directory of the application whose package.json dependency tree will be scanned. Defaults to the current working directory.",
+          "name": "appDir",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "filter": {
           "char": "f",
-          "description": "Force reset without confirmation",
-          "name": "force",
+          "description": "Only include classes extending this base class. Can be repeated (e.g., --filter BaseEngine --filter BaseAction).",
+          "name": "filter",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "exclude-packages": {
+          "char": "e",
+          "description": "Skip packages whose name starts with this prefix. Useful for excluding @memberjunction packages when using pre-built bootstrap manifests. Can be repeated.",
+          "name": "exclude-packages",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "quiet": {
+          "char": "q",
+          "description": "Suppress all output except errors.",
+          "name": "quiet",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "verbose": {
+          "char": "v",
+          "description": "Show detailed progress including per-package scanning info and skipped classes.",
+          "name": "verbose",
           "allowNo": false,
           "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "dbdoc:reset",
+      "id": "codegen:manifest",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -1173,31 +1207,39 @@
       "relativePath": [
         "dist",
         "commands",
-        "dbdoc",
-        "reset.js"
+        "codegen",
+        "manifest.js"
       ]
     },
-    "dbdoc:status": {
+    "doctor": {
       "aliases": [],
       "args": {},
-      "description": "Show analysis status and progress (delegates to db-auto-doc status)",
+      "description": "Diagnose a MemberJunction installation",
       "examples": [
         "<%= config.bin %> <%= command.id %>",
-        "<%= config.bin %> <%= command.id %> --state-file ./custom-state.json"
+        "<%= config.bin %> <%= command.id %> --dir ./my-mj-project",
+        "<%= config.bin %> <%= command.id %> --verbose"
       ],
       "flags": {
-        "state-file": {
-          "char": "s",
-          "description": "Path to state JSON file",
-          "name": "state-file",
+        "dir": {
+          "description": "Target directory to diagnose",
+          "name": "dir",
+          "default": ".",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "verbose": {
+          "char": "v",
+          "description": "Show detailed output including suggested fixes inline",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "dbdoc:status",
+      "id": "doctor",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -1207,8 +1249,8 @@
       "relativePath": [
         "dist",
         "commands",
-        "dbdoc",
-        "status.js"
+        "doctor",
+        "index.js"
       ]
     },
     "install": {
@@ -1314,27 +1356,85 @@
         "index.js"
       ]
     },
-    "doctor": {
+    "migrate": {
       "aliases": [],
       "args": {},
-      "description": "Diagnose a MemberJunction installation",
+      "description": "Migrate MemberJunction database to latest version",
       "examples": [
-        "<%= config.bin %> <%= command.id %>",
-        "<%= config.bin %> <%= command.id %> --dir ./my-mj-project",
-        "<%= config.bin %> <%= command.id %> --verbose"
+        "<%= config.bin %> <%= command.id %>\n",
+        "<%= config.bin %> <%= command.id %> --schema __BCSaaS --dir ./migrations/v1\n",
+        "<%= config.bin %> <%= command.id %> --schema __BCSaaS --tag v1.0.0\n"
       ],
       "flags": {
+        "verbose": {
+          "char": "v",
+          "description": "Enable additional logging",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "tag": {
+          "char": "t",
+          "description": "Version tag to use for running remote migrations",
+          "name": "tag",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "schema": {
+          "char": "s",
+          "description": "Target schema (overrides coreSchema from config)",
+          "name": "schema",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "dir": {
-          "description": "Target directory to diagnose",
+          "description": "Migration source directory (overrides migrationsLocation from config)",
           "name": "dir",
-          "default": ".",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "migrate",
+      "pluginAlias": "@memberjunction/cli",
+      "pluginName": "@memberjunction/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "migrate",
+        "index.js"
+      ]
+    },
+    "querygen:export": {
+      "aliases": [],
+      "args": {},
+      "description": "Export queries from database to metadata files",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> --output ./metadata/queries",
+        "<%= config.bin %> <%= command.id %> --verbose"
+      ],
+      "flags": {
+        "output": {
+          "char": "o",
+          "description": "Output directory",
+          "name": "output",
+          "default": "./metadata/queries",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
         "verbose": {
           "char": "v",
-          "description": "Show detailed output including suggested fixes inline",
+          "description": "Verbose output",
           "name": "verbose",
           "allowNo": false,
           "type": "boolean"
@@ -1342,7 +1442,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "doctor",
+      "id": "querygen:export",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -1352,54 +1452,169 @@
       "relativePath": [
         "dist",
         "commands",
-        "doctor",
-        "index.js"
+        "querygen",
+        "export.js"
       ]
     },
-    "migrate": {
+    "querygen:generate": {
       "aliases": [],
       "args": {},
-      "description": "Migrate MemberJunction database to latest version",
+      "description": "Generate SQL query templates for entities using AI",
       "examples": [
-        "<%= config.bin %> <%= command.id %>\n",
-        "<%= config.bin %> <%= command.id %> --schema __BCSaaS --dir ./migrations/v1\n",
-        "<%= config.bin %> <%= command.id %> --schema __BCSaaS --tag v1.0.0\n"
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> --entities \"Customers,Orders\"",
+        "<%= config.bin %> <%= command.id %> --max-entities 5 --verbose",
+        "<%= config.bin %> <%= command.id %> --mode database"
+      ],
+      "flags": {
+        "entities": {
+          "char": "e",
+          "description": "Specific entities to generate queries for (comma-separated)",
+          "name": "entities",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "exclude-entities": {
+          "char": "x",
+          "description": "Entities to exclude (comma-separated)",
+          "name": "exclude-entities",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "exclude-schemas": {
+          "char": "s",
+          "description": "Schemas to exclude (comma-separated)",
+          "name": "exclude-schemas",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "max-entities": {
+          "char": "m",
+          "description": "Max entities per group",
+          "name": "max-entities",
+          "default": 3,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "target-groups": {
+          "char": "t",
+          "description": "Target number of entity groups to generate",
+          "name": "target-groups",
+          "default": 75,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "max-refinements": {
+          "char": "r",
+          "description": "Max refinement iterations",
+          "name": "max-refinements",
+          "default": 3,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "max-fixes": {
+          "char": "f",
+          "description": "Max error-fixing attempts",
+          "name": "max-fixes",
+          "default": 5,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "model": {
+          "description": "Preferred AI model",
+          "name": "model",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "vendor": {
+          "description": "Preferred AI vendor",
+          "name": "vendor",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "output": {
+          "char": "o",
+          "description": "Output directory",
+          "name": "output",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "mode": {
+          "description": "Output mode: metadata|database|both",
+          "name": "mode",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "metadata",
+            "database",
+            "both"
+          ],
+          "type": "option"
+        },
+        "verbose": {
+          "char": "v",
+          "description": "Verbose output",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "querygen:generate",
+      "pluginAlias": "@memberjunction/cli",
+      "pluginName": "@memberjunction/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "querygen",
+        "generate.js"
+      ]
+    },
+    "querygen:validate": {
+      "aliases": [],
+      "args": {},
+      "description": "Validate existing query templates",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> --path ./metadata/queries",
+        "<%= config.bin %> <%= command.id %> --verbose"
       ],
       "flags": {
+        "path": {
+          "char": "p",
+          "description": "Path to queries metadata file or directory",
+          "name": "path",
+          "default": "./metadata/queries",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "verbose": {
           "char": "v",
-          "description": "Enable additional logging",
+          "description": "Verbose output",
           "name": "verbose",
           "allowNo": false,
           "type": "boolean"
-        },
-        "tag": {
-          "char": "t",
-          "description": "Version tag to use for running remote migrations",
-          "name": "tag",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "schema": {
-          "char": "s",
-          "description": "Target schema (overrides coreSchema from config)",
-          "name": "schema",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "dir": {
-          "description": "Migration source directory (overrides migrationsLocation from config)",
-          "name": "dir",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "migrate",
+      "id": "querygen:validate",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -1409,8 +1624,8 @@
       "relativePath": [
         "dist",
         "commands",
-        "migrate",
-        "index.js"
+        "querygen",
+        "validate.js"
       ]
     },
     "sql-audit": {
@@ -2681,221 +2896,6 @@
         "index.js"
       ]
     },
-    "querygen:export": {
-      "aliases": [],
-      "args": {},
-      "description": "Export queries from database to metadata files",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>",
-        "<%= config.bin %> <%= command.id %> --output ./metadata/queries",
-        "<%= config.bin %> <%= command.id %> --verbose"
-      ],
-      "flags": {
-        "output": {
-          "char": "o",
-          "description": "Output directory",
-          "name": "output",
-          "default": "./metadata/queries",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "verbose": {
-          "char": "v",
-          "description": "Verbose output",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "querygen:export",
-      "pluginAlias": "@memberjunction/cli",
-      "pluginName": "@memberjunction/cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "querygen",
-        "export.js"
-      ]
-    },
-    "querygen:generate": {
-      "aliases": [],
-      "args": {},
-      "description": "Generate SQL query templates for entities using AI",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>",
-        "<%= config.bin %> <%= command.id %> --entities \"Customers,Orders\"",
-        "<%= config.bin %> <%= command.id %> --max-entities 5 --verbose",
-        "<%= config.bin %> <%= command.id %> --mode database"
-      ],
-      "flags": {
-        "entities": {
-          "char": "e",
-          "description": "Specific entities to generate queries for (comma-separated)",
-          "name": "entities",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "exclude-entities": {
-          "char": "x",
-          "description": "Entities to exclude (comma-separated)",
-          "name": "exclude-entities",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "exclude-schemas": {
-          "char": "s",
-          "description": "Schemas to exclude (comma-separated)",
-          "name": "exclude-schemas",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "max-entities": {
-          "char": "m",
-          "description": "Max entities per group",
-          "name": "max-entities",
-          "default": 3,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "target-groups": {
-          "char": "t",
-          "description": "Target number of entity groups to generate",
-          "name": "target-groups",
-          "default": 75,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "max-refinements": {
-          "char": "r",
-          "description": "Max refinement iterations",
-          "name": "max-refinements",
-          "default": 3,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "max-fixes": {
-          "char": "f",
-          "description": "Max error-fixing attempts",
-          "name": "max-fixes",
-          "default": 5,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "model": {
-          "description": "Preferred AI model",
-          "name": "model",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "vendor": {
-          "description": "Preferred AI vendor",
-          "name": "vendor",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "output": {
-          "char": "o",
-          "description": "Output directory",
-          "name": "output",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "mode": {
-          "description": "Output mode: metadata|database|both",
-          "name": "mode",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "metadata",
-            "database",
-            "both"
-          ],
-          "type": "option"
-        },
-        "verbose": {
-          "char": "v",
-          "description": "Verbose output",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "querygen:generate",
-      "pluginAlias": "@memberjunction/cli",
-      "pluginName": "@memberjunction/cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "querygen",
-        "generate.js"
-      ]
-    },
-    "querygen:validate": {
-      "aliases": [],
-      "args": {},
-      "description": "Validate existing query templates",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>",
-        "<%= config.bin %> <%= command.id %> --path ./metadata/queries",
-        "<%= config.bin %> <%= command.id %> --verbose"
-      ],
-      "flags": {
-        "path": {
-          "char": "p",
-          "description": "Path to queries metadata file or directory",
-          "name": "path",
-          "default": "./metadata/queries",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "verbose": {
-          "char": "v",
-          "description": "Verbose output",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "querygen:validate",
-      "pluginAlias": "@memberjunction/cli",
-      "pluginName": "@memberjunction/cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "querygen",
-        "validate.js"
-      ]
-    },
     "ai:actions:list": {
       "aliases": [],
       "args": {},
@@ -3504,5 +3504,5 @@
       ]
     }
   },
-  "version": "5.5.0"
+  "version": "5.6.0"
 }