Merge branch 'main' into dev

# Conflicts:
#	.mokogitea/CLAUDE.md
#	.mokogitea/ISSUE_TEMPLATE/config.yml
#	.mokogitea/ISSUE_TEMPLATE/documentation.md
#	.mokogitea/ISSUE_TEMPLATE/feature_request.md
#	.mokogitea/ISSUE_TEMPLATE/security.md
#	.mokogitea/branch-protection.yml
#	.mokogitea/bulk-repo-sync.yml
#	.mokogitea/pr-branch-check.yml
#	.mokogitea/renovate.yml
#	.mokogitea/sync-wikis.yml
#	.mokogitea/workflows/auto-bump.yml
#	.mokogitea/workflows/auto-release.yml
#	.mokogitea/workflows/ci-platform.yml
#	.mokogitea/workflows/cleanup.yml
#	.mokogitea/workflows/gitleaks.yml
#	.mokogitea/workflows/issue-branch.yml
#	.mokogitea/workflows/notify.yml
#	.mokogitea/workflows/pre-release.yml
#	.mokogitea/workflows/repo-health.yml
#	.mokogitea/workflows/security-audit.yml
#	.script-registry.json
#	CHANGELOG.md
#	PLUGIN_SCRIPTS.md
#	README.md
#	analysis/index.md
#	automation/bulk_joomla_template.php
#	automation/bulk_sync.php
#	automation/enrich_manifest_xml.php
#	automation/enrich_mokostandards_xml.php
#	automation/index.md
#	automation/migrate_to_gitea.php
#	automation/push_files.php
#	automation/push_manifest_xml.php
#	automation/push_mokostandards_xml.php
#	automation/repo_cleanup.php
#	bin/moko
#	cli/archive_repo.php
#	cli/audit_query.php
#	cli/badge_update.php
#	cli/branch_rename.php
#	cli/bulk_workflow_push.php
#	cli/bulk_workflow_trigger.php
#	cli/changelog_promote.php
#	cli/changelog_prune.php
#	cli/client_dashboard.php
#	cli/client_health_check.php
#	cli/client_inventory.php
#	cli/client_provision.php
#	cli/completion.php
#	cli/create_project.php
#	cli/create_repo.php
#	cli/deploy_joomla.php
#	cli/dev_branch_reset.php
#	cli/grafana_dashboard.php
#	cli/joomla_build.php
#	cli/joomla_compat_check.php
#	cli/joomla_metadata_validate.php
#	cli/joomla_release.php
#	cli/license_manage.php
#	cli/manifest_element.php
#	cli/manifest_licensing.php
#	cli/manifest_read.php
#	cli/package_build.php
#	cli/platform_detect.php
#	cli/release.php
#	cli/release_body_update.php
#	cli/release_cascade.php
#	cli/release_create.php
#	cli/release_manage.php
#	cli/release_mirror.php
#	cli/release_notes.php
#	cli/release_package.php
#	cli/release_promote.php
#	cli/release_publish.php
#	cli/release_validate.php
#	cli/release_verify.php
#	cli/scaffold_client.php
#	cli/sync_rulesets.php
#	cli/theme_lint.php
#	cli/updates_xml_build.php
#	cli/updates_xml_sync.php
#	cli/version_auto_bump.php
#	cli/version_bump.php
#	cli/version_bump_remote.php
#	cli/version_check.php
#	cli/version_read.php
#	cli/version_reset_dev.php
#	cli/version_set_platform.php
#	cli/wiki_sync.php
#	cli/workflow_sync.php
#	composer.json
#	deploy/backup-before-deploy.php
#	deploy/deploy-dolibarr.php
#	deploy/deploy-joomla.php
#	deploy/deploy-sftp.php
#	deploy/health-check.php
#	deploy/rollback-joomla.php
#	deploy/sync-joomla.php
#	fix/fix_line_endings.php
#	fix/fix_permissions.php
#	fix/fix_tabs.php
#	fix/fix_trailing_spaces.php
#	fix/index.md
#	index.md
#	lib/CliBase.php
#	lib/Common.php
#	lib/Enterprise/AbstractProjectPlugin.php
#	lib/Enterprise/ApiClient.php
#	lib/Enterprise/AuditLogger.php
#	lib/Enterprise/CheckpointManager.php
#	lib/Enterprise/CliFramework.php
#	lib/Enterprise/Config.php
#	lib/Enterprise/ConfigValidator.php
#	lib/Enterprise/EnterpriseReadinessValidator.php
#	lib/Enterprise/ErrorRecovery.php
#	lib/Enterprise/FileFixUtility.php
#	lib/Enterprise/GitHubAdapter.php
#	lib/Enterprise/GitPlatformAdapter.php
#	lib/Enterprise/InputValidator.php
#	lib/Enterprise/ManifestParser.php
#	lib/Enterprise/ManifestReader.php
#	lib/Enterprise/MetricsCollector.php
#	lib/Enterprise/MokoGiteaAdapter.php
#	lib/Enterprise/PackageBuilder.php
#	lib/Enterprise/PlatformAdapterFactory.php
#	lib/Enterprise/PluginFactory.php
#	lib/Enterprise/PluginRegistry.php
#	lib/Enterprise/Plugins/ApiPlugin.php
#	lib/Enterprise/Plugins/DocumentationPlugin.php
#	lib/Enterprise/Plugins/DolibarrPlugin.php
#	lib/Enterprise/Plugins/GenericPlugin.php
#	lib/Enterprise/Plugins/JoomlaPlugin.php
#	lib/Enterprise/Plugins/McpServerPlugin.php
#	lib/Enterprise/Plugins/MobilePlugin.php
#	lib/Enterprise/Plugins/NodeJsPlugin.php
#	lib/Enterprise/Plugins/PythonPlugin.php
#	lib/Enterprise/Plugins/TerraformPlugin.php
#	lib/Enterprise/Plugins/WordPressPlugin.php
#	lib/Enterprise/ProjectConfigValidator.php
#	lib/Enterprise/ProjectMetricsCollector.php
#	lib/Enterprise/ProjectPluginInterface.php
#	lib/Enterprise/ProjectTypeDetector.php
#	lib/Enterprise/RecoveryError.php
#	lib/Enterprise/RecoveryManager.php
#	lib/Enterprise/RepositoryHealthChecker.php
#	lib/Enterprise/RepositorySynchronizer.php
#	lib/Enterprise/RetryHelper.php
#	lib/Enterprise/SecurityValidator.php
#	lib/Enterprise/SourceResolver.php
#	lib/Enterprise/SynchronizationException.php
#	lib/Enterprise/TransactionManager.php
#	lib/Enterprise/UnifiedValidation.php
#	lib/index.md
#	lib/plugins/Joomla/UpdateXmlGenerator.php
#	maintenance/index.md
#	maintenance/pin_action_shas.php
#	maintenance/repo_inventory.php
#	maintenance/rotate_secrets.php
#	maintenance/setup_labels.php
#	maintenance/sync_dolibarr_readmes.php
#	maintenance/update_repo_inventory.php
#	maintenance/update_sha_hashes.php
#	maintenance/update_version_from_readme.php
#	mcp/config.example.json
#	mcp/package.json
#	mcp/src/config.ts
#	mcp/src/index.ts
#	mcp/src/runner.ts
#	mcp/src/types.ts
#	phpcs.xml
#	plugin_health_check.php
#	plugin_list.php
#	plugin_metrics.php
#	plugin_readiness.php
#	plugin_validate.php
#	release/generate_dolibarr_version_txt.php
#	release/generate_joomla_update_xml.php
#	src/functions.php
#	templates/configs/README.md
#	templates/configs/index.md
#	templates/configs/manifest.xml.template
#	templates/configs/manifest.yml.template
#	templates/configs/mokostandards.xml.template
#	templates/configs/mokostandards.yml.template
#	templates/configs/phpcs.xml
#	templates/docs/README.md
#	templates/docs/extra/README.md
#	templates/docs/extra/index.md
#	templates/docs/index.md
#	templates/docs/required/GOVERNANCE.md
#	templates/docs/required/README.md
#	templates/docs/required/index.md
#	templates/docs/required/template-CONTRIBUTING.md
#	templates/docs/required/template-README.md
#	templates/docs/required/template-SECURITY.md
#	templates/index.md
#	templates/licenses/README.md
#	templates/licenses/index.md
#	templates/makefiles/README.md
#	templates/mokogitea/CLAUDE.dolibarr.md.template
#	templates/mokogitea/CLAUDE.joomla.md.template
#	templates/mokogitea/CLAUDE.md.template
#	templates/mokogitea/ISSUE_TEMPLATE/config.yml
#	templates/mokogitea/ISSUE_TEMPLATE/documentation.md
#	templates/mokogitea/ISSUE_TEMPLATE/dolibarr_module_id_request.md
#	templates/mokogitea/ISSUE_TEMPLATE/feature_request.md
#	templates/mokogitea/ISSUE_TEMPLATE/security.md
#	templates/mokogitea/README.md
#	templates/mokogitea/copilot-instructions.dolibarr.md.template
#	templates/mokogitea/copilot-instructions.joomla.md.template
#	templates/mokogitea/copilot-instructions.md.template
#	templates/mokogitea/dependabot.yml.template
#	templates/mokogitea/override.tf.template
#	templates/required/README.md
#	templates/schemas/README.md
#	templates/schemas/manifest-schema.xsd
#	templates/schemas/moko-platform-schema.xsd
#	templates/schemas/mokostandards-schema.xsd
#	templates/schemas/schemas/README.md
#	templates/schemas/template-repository-structure.xml
#	templates/scripts/README.md
#	templates/scripts/common/CliBase.template.php
#	templates/scripts/fix/index.md
#	templates/scripts/index.md
#	templates/scripts/release/index.md
#	templates/scripts/release/package_dolibarr.php
#	templates/scripts/release/package_joomla.php
#	templates/scripts/sftp-config/README.md
#	templates/scripts/validate/dolibarr_module.php
#	templates/scripts/validate/index.md
#	templates/scripts/validate/validate_manifest.php
#	templates/scripts/validate/validate_structure.php
#	templates/security/README.md
#	templates/security/index.php
#	templates/stubs/dolibarr.php
#	templates/stubs/joomla.php
#	templates/web/index.php
#	tests/Enterprise/GitPlatformAdapterTest.php
#	tests/Unit/VersionBumpTest.php
#	tests/Unit/VersionReadTest.php
#	tests/index.md
#	tests/test_circuit_breaker_handling.php
#	tests/test_enterprise_libraries.php
#	validate/SECURITY_SCANNING.md
#	validate/auto_detect_platform.php
#	validate/check_changelog.php
#	validate/check_client_theme.php
#	validate/check_composer_deps.php
#	validate/check_dolibarr_module.php
#	validate/check_enterprise_readiness.php
#	validate/check_file_integrity.php
#	validate/check_joomla_manifest.php
#	validate/check_language_structure.php
#	validate/check_license_headers.php
#	validate/check_no_secrets.php
#	validate/check_paths.php
#	validate/check_php_syntax.php
#	validate/check_repo_health.php
#	validate/check_structure.php
#	validate/check_tabs.php
#	validate/check_version_consistency.php
#	validate/check_wiki_health.php
#	validate/check_xml_wellformed.php
#	validate/index.md
#	validate/scan_drift.php
#	wrappers/auto_detect_platform.php
#	wrappers/bulk_sync.php
#	wrappers/check_changelog.php
#	wrappers/check_dolibarr_module.php
#	wrappers/check_enterprise_readiness.php
#	wrappers/check_joomla_manifest.php
#	wrappers/check_language_structure.php
#	wrappers/check_license_headers.php
#	wrappers/check_no_secrets.php
#	wrappers/check_paths.php
#	wrappers/check_php_syntax.php
#	wrappers/check_repo_health.php
#	wrappers/check_structure.php
#	wrappers/check_tabs.php
#	wrappers/check_version_consistency.php
#	wrappers/check_xml_wellformed.php
#	wrappers/deploy_sftp.php
#	wrappers/fix_line_endings.php
#	wrappers/fix_permissions.php
#	wrappers/fix_tabs.php
#	wrappers/fix_trailing_spaces.php
#	wrappers/gen_wrappers.php
#	wrappers/index.md
#	wrappers/pin_action_shas.php
#	wrappers/plugin_health_check.php
#	wrappers/plugin_list.php
#	wrappers/plugin_metrics.php
#	wrappers/plugin_readiness.php
#	wrappers/plugin_validate.php
#	wrappers/scan_drift.php
#	wrappers/setup_labels.php
#	wrappers/sync_dolibarr_readmes.php
#	wrappers/update_sha_hashes.php
#	wrappers/update_version_from_readme.php

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "templates/repos/Template-Client"]
+	path = templates/repos/Template-Client
+	url = https://git.mokoconsulting.tech/MokoConsulting/Template-Client.git
+[submodule "templates/repos/Template-Generic"]
+	path = templates/repos/Template-Generic
+	url = https://git.mokoconsulting.tech/MokoConsulting/Template-Generic.git
+[submodule "templates/repos/Template-Joomla"]
+	path = templates/repos/Template-Joomla
+	url = https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla.git
+[submodule "templates/repos/Template-MCP"]
+	path = templates/repos/Template-MCP
+	url = https://git.mokoconsulting.tech/MokoConsulting/Template-MCP.git

.mokogitea/CLAUDE.md

@@ -0,0 +1,88 @@
+<<<<<<< HEAD
+# MokoCLI
+=======
+# mokoplatform
+>>>>>>> main
+
+Enterprise automation, validation, sync, and governance engine for all Moko Consulting repositories.
+
+## Quick Reference
+
+| Field | Value |
+|---|---|
+| **Language** | PHP 8.1+ |
+| **Version** | 09.01.00 |
+| **Branch** | develop on `dev`, merge to `main` (protected) |
+<<<<<<< HEAD
+| **Wiki** | [MokoCLI Wiki](https://git.mokoconsulting.tech/MokoConsulting/mokocli/wiki) |
+=======
+| **Wiki** | [mokoplatform Wiki](https://git.mokoconsulting.tech/MokoConsulting/mokoplatform/wiki) |
+>>>>>>> main
+
+## Commands
+
+```bash
+composer install                         # Install PHP dependencies
+php bin/moko health --path .             # Repo health check
+php bin/moko check:syntax --path .       # PHP syntax check
+php bin/moko drift --org MokoConsulting  # Scan for standards drift
+php bin/moko dashboard --token $TOKEN -o dashboard.html  # Client dashboard
+
+# Code quality
+php vendor/bin/phpcs --standard=phpcs.xml -n lib/ validate/ automation/ cli/
+php vendor/bin/phpcbf --standard=phpcs.xml lib/ validate/ automation/ cli/
+php vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=512M
+composer check                           # Run all checks
+```
+
+## Architecture
+
+| Directory | Purpose |
+|---|---|
+| `cli/` | 32 standalone CLI tools (version, release, build, repo management) |
+| `validate/` | 20 validation scripts (syntax, structure, manifests, drift) |
+| `automation/` | 7 bulk operations (sync, push files, templates, cleanup) |
+| `lib/Enterprise/` | Core library — CliFramework, ApiClient, adapters, validators |
+| `lib/Enterprise/Plugins/` | 11 platform plugins (Joomla, Dolibarr, Node.js, Python, etc.) |
+| `deploy/` | SFTP deployment scripts (Joomla, Dolibarr, health checks) |
+| `templates/` | Universal templates, configs, governance schema |
+| `.mokogitea/workflows/` | CI/CD workflows (Gitea Actions) |
+| `bin/moko` | Unified CLI dispatcher — `php bin/moko <command>` |
+| `monitoring/sites.json` | Sites list for mcp_mokomonitor |
+
+### CLI Framework
+
+All CLI tools extend `MokoCli\CliFramework` (`lib/Enterprise/CliFramework.php`).
+Built-in flags: `--help`, `--verbose`, `--quiet`, `--dry-run`.
+After adding a CLI tool, register it in `bin/moko` COMMAND_MAP.
+
+### Platform Adapters
+
+- `MokoGiteaAdapter` — git.mokoconsulting.tech (primary)
+- `GitHubAdapter` — github.com mirrors
+
+### Plugin System
+
+Platform-specific logic in `lib/Enterprise/Plugins/`. Each implements `ProjectPluginInterface` with health checks, validation, build commands, config schemas.
+
+## Code Quality
+
+| Tool | Level | Config |
+|---|---|---|
+| PHPCS | PSR-12 (errors only) | `phpcs.xml` |
+| PHPStan | Level 2 (advisory) | `phpstan.neon` |
+
+PHPStan runs with `--memory-limit=512M`. CI enforces PHPCS errors; PHPStan is `continue-on-error`.
+
+## Rules
+
+- **Never commit** `.claude/`, `.mcp.json`, `TODO.md`, `*.min.css`/`*.min.js`
+- **Attribution**: `Authored-by: Moko Consulting`
+- **Workflow directory**: `.mokogitea/` (not `.gitea/` or `.github/`)
+- **Wiki**: documentation lives in the Gitea wiki, not `docs/` files
+- **New CLI tools**: extend `CliFramework`, not `CLIApp` (legacy)
+<<<<<<< HEAD
+- **Standards**: [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/mokocli/wiki/Home)
+=======
+- **Standards**: [MokoCli](https://git.mokoconsulting.tech/MokoConsulting/mokoplatform/wiki/Home)
+>>>>>>> main

.mokogitea/ISSUE_TEMPLATE/config.yml

@@ -7,8 +7,13 @@ contact_links:
   - name: 💬 Ask a Question
     url: https://mokoconsulting.tech/
     about: Get help or ask questions through our website
-  - name: 📚 moko-platform Documentation
+<<<<<<< HEAD
-    url: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+  - name: 📚 MokoCLI Documentation
+    url: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+  - name: 📚 mokoplatform Documentation
+    url: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
     about: View our coding standards and best practices
   - name: 🔒 Report a Security Vulnerability
     url: https://git.mokoconsulting.tech/mokoconsulting-tech/.github-private/security/advisories/new

.mokogitea/ISSUE_TEMPLATE/documentation.md

@@ -42,7 +42,11 @@ Suggested text here
 <!-- Add any other context, screenshots, or references -->
 
 ## Standards Alignment
-- [ ] Follows moko-platform documentation guidelines
+<<<<<<< HEAD
+- [ ] Follows MokoCLI documentation guidelines
+=======
+- [ ] Follows mokoplatform documentation guidelines
+>>>>>>> main
 - [ ] Uses en_US/en_GB localization
 - [ ] Includes proper SPDX headers where applicable
 

.mokogitea/ISSUE_TEMPLATE/feature_request.md

@@ -37,7 +37,11 @@ If you have ideas about how this could be implemented, share them here:
 Add any other context, mockups, or screenshots about the feature request here.
 
 ## Relevant Standards
-Does this relate to any standards in [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform)?
+<<<<<<< HEAD
+Does this relate to any standards in [MokoCLI](https://git.mokoconsulting.tech/MokoConsulting/mokocli)?
+=======
+Does this relate to any standards in [mokoplatform](https://git.mokoconsulting.tech/MokoConsulting/mokoplatform)?
+>>>>>>> main
 - [ ] Accessibility (WCAG 2.1 AA)
 - [ ] Localization (en_US/en_GB)
 - [ ] Security best practices

.mokogitea/ISSUE_TEMPLATE/security.md

@@ -35,7 +35,11 @@ Use this template only for:
 <!-- Describe how this could be addressed -->
 
 ## Standards Reference
-Does this relate to security standards in [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform)?
+<<<<<<< HEAD
+Does this relate to security standards in [MokoCLI](https://git.mokoconsulting.tech/MokoConsulting/mokocli)?
+=======
+Does this relate to security standards in [mokoplatform](https://git.mokoconsulting.tech/MokoConsulting/mokoplatform)?
+>>>>>>> main
 - [ ] SPDX license identifiers
 - [ ] Secret management
 - [ ] Dependency security

.mokogitea/branch-protection.yml

@@ -2,8 +2,13 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Automation
+<<<<<<< HEAD
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# INGROUP: MokoCLI.Automation
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+# INGROUP: mokoplatform.Automation
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
 # PATH: /.gitea/workflows/branch-protection.yml
 # BRIEF: Apply standardised branch protection rules to all governed repositories
 #
@@ -57,13 +62,18 @@ jobs:
       - name: Determine target repos
         id: repos
         env:
-          GA_TOKEN: ${{ secrets.GA_TOKEN }}
+          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
         run: |
           API="${GITEA_URL}/api/v1"
 
           # Platform/standards/infra repos to exclude
-          EXCLUDE="gitea-org-config org-profile gitea-private .mokogitea-private moko-platform MokoTesting"
+<<<<<<< HEAD
+          EXCLUDE="gitea-org-config org-profile gitea-private .mokogitea-private mokocli mokoplatform MokoTesting"
           EXCLUDE="$EXCLUDE MokoStandards-Template-Client MokoStandards-Template-Dolibarr MokoStandards-Template-Generic MokoStandards-Template-Joomla MokoDoliProjTemplate"
+=======
+          EXCLUDE="gitea-org-config org-profile gitea-private .mokogitea-private mokoplatform MokoTesting"
+          EXCLUDE="$EXCLUDE MokoCli-Template-Client MokoCli-Template-Dolibarr MokoCli-Template-Generic MokoCli-Template-Joomla MokoDoliProjTemplate"
+>>>>>>> main
 
           if [ -n "${{ inputs.repos }}" ]; then
             # User-specified repos
@@ -105,7 +115,7 @@ jobs:
 
       - name: Apply protection rules
         env:
-          GA_TOKEN: ${{ secrets.GA_TOKEN }}
+          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
           DRY_RUN: ${{ inputs.dry_run || 'false' }}
         run: |
           API="${GITEA_URL}/api/v1"

.mokogitea/bulk-repo-sync.yml

@@ -2,8 +2,13 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Automation
+<<<<<<< HEAD
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# INGROUP: MokoCLI.Automation
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+# INGROUP: mokoplatform.Automation
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
 # PATH: /.gitea/workflows/bulk-repo-sync.yml
 # BRIEF: Bulk repo sync — runs from API repo, syncs standards to all governed repos
 
@@ -84,8 +89,8 @@ jobs:
           echo "Running: php automation/bulk_sync.php ${{ steps.args.outputs.args }}"
           php automation/bulk_sync.php ${{ steps.args.outputs.args }} 2>&1 | tee /tmp/bulk_sync.log
         env:
-          GA_TOKEN: ${{ secrets.GA_TOKEN }}
+          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          GH_TOKEN: ${{ secrets.GH_PAT }}
           GIT_PLATFORM: gitea
           GITEA_URL: https://git.mokoconsulting.tech
           GITEA_ORG: MokoConsulting
@@ -112,7 +117,7 @@ jobs:
             bash automation/enforce_tags.sh || echo "Tag enforcement had errors (non-fatal)"
           fi
         env:
-          GA_TOKEN: ${{ secrets.GA_TOKEN }}
+          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
           GITEA_URL: https://git.mokoconsulting.tech
           GITEA_ORG: MokoConsulting
 

.mokogitea/pr-branch-check.yml

@@ -2,9 +2,15 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: moko-platform.CI
+<<<<<<< HEAD
-# INGROUP: moko-platform
+# DEFGROUP: MokoCLI.CI
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# INGROUP: MokoCLI
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+# DEFGROUP: mokoplatform.CI
+# INGROUP: mokoplatform
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
 # PATH: /.gitea/workflows/pr-branch-check.yml
 # BRIEF: PR branch merge policy enforcement
 #

.mokogitea/renovate.yml

@@ -4,8 +4,13 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Automation
+<<<<<<< HEAD
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# INGROUP: MokoCLI.Automation
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+# INGROUP: mokoplatform.Automation
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
 # PATH: /.gitea/workflows/renovate.yml
 # BRIEF: Run Renovate Bot across all governed repos for dependency updates
 #
@@ -57,12 +62,17 @@ jobs:
       - name: Determine target repos
         id: repos
         env:
-          GA_TOKEN: ${{ secrets.GA_TOKEN }}
+          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
         run: |
           API="${GITEA_URL}/api/v1"
 
-          EXCLUDE="gitea-org-config org-profile gitea-private .mokogitea-private moko-platform MokoTesting"
+<<<<<<< HEAD
+          EXCLUDE="gitea-org-config org-profile gitea-private .mokogitea-private mokocli mokoplatform MokoTesting"
           EXCLUDE="$EXCLUDE MokoStandards-Template-Client MokoStandards-Template-Dolibarr MokoStandards-Template-Generic MokoStandards-Template-Joomla MokoDoliProjTemplate"
+=======
+          EXCLUDE="gitea-org-config org-profile gitea-private .mokogitea-private mokoplatform MokoTesting"
+          EXCLUDE="$EXCLUDE MokoCli-Template-Client MokoCli-Template-Dolibarr MokoCli-Template-Generic MokoCli-Template-Joomla MokoDoliProjTemplate"
+>>>>>>> main
 
           if [ -n "${{ inputs.repos }}" ]; then
             REPOS=$(echo "${{ inputs.repos }}" | tr ',' ' ')
@@ -107,7 +117,7 @@ jobs:
       - name: Run Renovate
         if: steps.repos.outputs.repo_list != ''
         env:
-          RENOVATE_TOKEN: ${{ secrets.GA_TOKEN }}
+          RENOVATE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
           RENOVATE_PLATFORM: gitea
           RENOVATE_ENDPOINT: ${{ env.GITEA_URL }}/api/v1
           RENOVATE_GIT_AUTHOR: 'Renovate Bot <renovate@mokoconsulting.tech>'

.mokogitea/sync-wikis.yml

@@ -4,8 +4,13 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Maintenance
+<<<<<<< HEAD
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# INGROUP: MokoCLI.Maintenance
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+# INGROUP: mokoplatform.Maintenance
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
 # PATH: /.gitea/workflows/sync-wikis.yml
 # BRIEF: Daily sync of all Gitea wikis to consolidated GitHub wiki repo
 
@@ -31,7 +36,7 @@ jobs:
 
       - name: Sync all wikis
         env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          GH_TOKEN: ${{ secrets.GH_PAT }}
           GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
         run: |
           if [ -z "$GH_TOKEN" ]; then

.mokogitea/workflows/auto-bump.yml

@@ -4,10 +4,17 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Release
+<<<<<<< HEAD
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# INGROUP: MokoCLI.Release
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 # PATH: /.mokogitea/workflows/auto-bump.yml
 # VERSION: 09.23.00
+=======
+# INGROUP: mokocli.Release
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# PATH: /.mokogitea/workflows/auto-bump.yml
+# VERSION: 09.02.00
+>>>>>>> main
 # BRIEF: Auto patch-bump version on every push to dev (skips merge commits)
 
 name: "Universal: Auto Version Bump"
@@ -43,19 +50,36 @@ jobs:
           token: ${{ secrets.MOKOGITEA_TOKEN }}
           fetch-depth: 1
 
-      - name: Setup moko-platform tools
+<<<<<<< HEAD
+      - name: Setup MokoCLI tools
+        run: |
+          # Check both new (mokocli) and legacy (mokoplatform) install paths
+          if [ -f "/opt/mokocli/cli/version_bump.php" ] && [ -f "/opt/mokocli/vendor/autoload.php" ]; then
+            echo "Using pre-installed /opt/mokocli"
+            echo "MOKO_CLI=/opt/mokocli/cli" >> "$GITHUB_ENV"
+          elif [ -f "/opt/mokoplatform/cli/version_bump.php" ] && [ -f "/opt/mokoplatform/vendor/autoload.php" ]; then
+            echo "Using pre-installed /opt/mokoplatform (legacy path)"
+            echo "MOKO_CLI=/opt/mokoplatform/cli" >> "$GITHUB_ENV"
+          else
+            if ! command -v composer &> /dev/null; then
+              sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+            fi
+            rm -rf /tmp/mokocli
+=======
+      - name: Setup mokocli tools
         run: |
           if ! command -v composer &> /dev/null; then
             sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
           fi
-          if [ -d "/opt/moko-platform/cli" ]; then
+          if [ -d "/opt/mokocli/cli" ]; then
-            echo "MOKO_CLI=/opt/moko-platform/cli" >> "$GITHUB_ENV"
+            echo "MOKO_CLI=/opt/mokocli/cli" >> "$GITHUB_ENV"
           else
+>>>>>>> main
             git clone --depth 1 --branch main --quiet \
-              "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/moko-platform.git" \
+              "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/mokocli.git" \
-              /tmp/moko-platform-api
+              /tmp/mokocli
-            cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet
+            cd /tmp/mokocli && composer install --no-dev --no-interaction --quiet
-            echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV"
+            echo "MOKO_CLI=/tmp/mokocli/cli" >> "$GITHUB_ENV"
           fi
 
       - name: Bump version

.mokogitea/workflows/auto-release.yml

@@ -4,8 +4,13 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Release
+<<<<<<< HEAD
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform
+# INGROUP: MokoCLI.Release
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+# INGROUP: mokocli.Release
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/mokocli
+>>>>>>> main
 # PATH: /templates/workflows/universal/auto-release.yml.template
 # VERSION: 05.00.00
 # BRIEF: Universal build & release � detects platform from manifest.xml
@@ -17,7 +22,7 @@
 # |  Reads manifest.xml (joomla|dolibarr|generic) to branch logic.       |
 # |                                                                        |
 # |  Platform-specific:                                                    |
-# |    joomla:   XML manifest, updates.xml, type-prefixed packages         |
+# |    joomla:   XML manifest, type-prefixed packages                      |
 # |    dolibarr: mod*.class.php, update.txt, dev version reset             |
 # |    generic:  README-only, no update stream                             |
 # |                                                                        |
@@ -66,25 +71,46 @@ jobs:
           token: ${{ secrets.MOKOGITEA_TOKEN }}
           fetch-depth: 1
 
-      - name: Setup moko-platform tools
+<<<<<<< HEAD
+      - name: Setup MokoCLI tools
+=======
+      - name: Setup mokocli tools
+>>>>>>> main
         env:
           MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
           MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
         run: |
-          if ! command -v composer &> /dev/null; then
+<<<<<<< HEAD
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+          # Check both new (mokocli) and legacy (mokoplatform) install paths
+          if [ -f /opt/mokocli/cli/version_bump.php ] && [ -f /opt/mokocli/vendor/autoload.php ]; then
+            echo "Using pre-installed /opt/mokocli"
+            echo MOKO_CLI=/opt/mokocli/cli >> $GITHUB_ENV
+          elif [ -f /opt/mokoplatform/cli/version_bump.php ] && [ -f /opt/mokoplatform/vendor/autoload.php ]; then
+            echo "Using pre-installed /opt/mokoplatform (legacy path)"
+            echo MOKO_CLI=/opt/mokoplatform/cli >> $GITHUB_ENV
+          else
+            echo "Falling back to fresh clone"
+=======
+          if [ -f /opt/mokocli/cli/version_bump.php ] && [ -f /opt/mokocli/vendor/autoload.php ]; then
+            echo Using pre-installed /opt/mokocli
+            echo MOKO_CLI=/opt/mokocli/cli >> $GITHUB_ENV
+          else
+            echo Falling back to fresh clone
+>>>>>>> main
+            if ! command -v composer > /dev/null 2>&1; then
+              sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer > /dev/null 2>&1
+            fi
+            rm -rf /tmp/mokocli
+            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/mokocli.git
+            git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/mokocli
+            cd /tmp/mokocli
+            composer install --no-dev --no-interaction --quiet
+            echo MOKO_CLI=/tmp/mokocli/cli >> $GITHUB_ENV
           fi
-          # Always fetch latest CLI tools — never use stale cache from previous runs
-          rm -rf /tmp/moko-platform-api
-          git clone --depth 1 --branch main --quiet \
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
-            /tmp/moko-platform-api
-          cd /tmp/moko-platform-api
-          composer install --no-dev --no-interaction --quiet
 
       - name: Rename branch to rc
         run: |
-          php /tmp/moko-platform-api/cli/branch_rename.php \
+          php ${MOKO_CLI}/branch_rename.php \
             --from "${{ github.event.pull_request.head.ref || 'dev' }}" --to rc \
             --token "${{ secrets.MOKOGITEA_TOKEN }}" \
             --api-base "${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" \
@@ -100,16 +126,52 @@ jobs:
 
       - name: Publish RC release
         run: |
-          php /tmp/moko-platform-api/cli/release_publish.php \
+          php ${MOKO_CLI}/release_publish.php \
             --path . --stability rc --bump minor --branch rc \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}"
-            --skip-update-stream
 
+<<<<<<< HEAD
+=======
+      - name: Update RC release notes from CHANGELOG.md
+        run: |
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
+
+          # Extract [Unreleased] section from changelog
+          NOTES=""
+          if [ -f "CHANGELOG.md" ]; then
+            NOTES=$(awk '/^## \[Unreleased\]/{found=1; next} /^## \[/{if(found) exit} found{print}' CHANGELOG.md)
+          fi
+          [ -z "$NOTES" ] && NOTES="Release candidate"
+
+          # Find the RC release and update its body
+          RELEASE_ID=$(curl -sf -H "Authorization: token ${TOKEN}" \
+            "${API_BASE}/releases/tags/release-candidate" \
+            | python3 -c "import json,sys; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || true)
+
+          if [ -n "$RELEASE_ID" ]; then
+            python3 -c "
+          import json, urllib.request
+          body = open('/dev/stdin').read()
+          payload = json.dumps({'body': body}).encode()
+          req = urllib.request.Request(
+              '${API_BASE}/releases/${RELEASE_ID}',
+              data=payload, method='PATCH',
+              headers={
+                  'Authorization': 'token ${TOKEN}',
+                  'Content-Type': 'application/json'
+              })
+          urllib.request.urlopen(req)
+          " <<< "$NOTES"
+            echo "RC release notes updated from CHANGELOG.md"
+          fi
+
+>>>>>>> main
       - name: Summary
         if: always()
         run: |
           echo "## Promoted to Release Candidate" >> $GITHUB_STEP_SUMMARY
-          echo "Branch renamed to rc, minor bump, RC release built (updates.xml managed by Gitea Pages)" >> $GITHUB_STEP_SUMMARY
+          echo "Branch renamed to rc, minor bump, RC release built" >> $GITHUB_STEP_SUMMARY
 
   # ── Merged PR → Build & Release (or promote RC to stable) ────────────────────
   release:
@@ -145,32 +207,178 @@ jobs:
           fi
           echo "No conflict markers found"
 
-      - name: Setup moko-platform tools
+<<<<<<< HEAD
+      - name: Setup MokoCLI tools
+=======
+      - name: Setup mokocli tools
+>>>>>>> main
         env:
           MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
           MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
           COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_MIRROR_TOKEN }}"}}'
         run: |
-          # Ensure PHP + Composer are available
+<<<<<<< HEAD
-          if ! command -v composer &> /dev/null; then
+          # Check both new (mokocli) and legacy (mokoplatform) install paths
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+          if [ -f /opt/mokocli/cli/version_bump.php ] && [ -f /opt/mokocli/vendor/autoload.php ]; then
+            echo "Using pre-installed /opt/mokocli"
+            echo MOKO_CLI=/opt/mokocli/cli >> $GITHUB_ENV
+          elif [ -f /opt/mokoplatform/cli/version_bump.php ] && [ -f /opt/mokoplatform/vendor/autoload.php ]; then
+            echo "Using pre-installed /opt/mokoplatform (legacy path)"
+            echo MOKO_CLI=/opt/mokoplatform/cli >> $GITHUB_ENV
+          else
+            echo "Falling back to fresh clone"
+=======
+          if [ -f /opt/mokocli/cli/version_bump.php ] && [ -f /opt/mokocli/vendor/autoload.php ]; then
+            echo Using pre-installed /opt/mokocli
+            echo MOKO_CLI=/opt/mokocli/cli >> $GITHUB_ENV
+          else
+            echo Falling back to fresh clone
+>>>>>>> main
+            if ! command -v composer > /dev/null 2>&1; then
+              sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer > /dev/null 2>&1
+            fi
+            rm -rf /tmp/mokocli
+            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/mokocli.git
+            git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/mokocli
+            cd /tmp/mokocli
+            composer install --no-dev --no-interaction --quiet
+            echo MOKO_CLI=/tmp/mokocli/cli >> $GITHUB_ENV
           fi
-          # Always fetch latest CLI tools — never use stale cache from previous runs
-          rm -rf /tmp/moko-platform-api
-          git clone --depth 1 --branch main --quiet \
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
-            /tmp/moko-platform-api
-          cd /tmp/moko-platform-api
-          composer install --no-dev --no-interaction --quiet
 
+<<<<<<< HEAD
+      - name: "Publish stable release"
+        run: |
+          php ${MOKO_CLI}/release_publish.php \
+            --path . --stability stable --bump minor --branch main \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}"
+
+      - name: Update release notes from CHANGELOG.md
+        run: |
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+
+          # Extract [Unreleased] section from changelog
+          if [ -f "CHANGELOG.md" ]; then
+            NOTES=$(awk '/^## \[Unreleased\]/{found=1; next} /^## \[/{if(found) exit} found{print}' CHANGELOG.md)
+            [ -z "$NOTES" ] && NOTES="Stable release"
+          else
+            NOTES="Stable release"
+          fi
+
+          # Update release body via API
+          RELEASE_ID=$(curl -sf -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
+            "${API_BASE}/releases/tags/stable" | python3 -c "import json,sys; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || true)
+
+=======
+      - name: "Detect platform"
+        id: platform
+        run: |
+          php ${MOKO_CLI}/platform_detect.php --path . --github-output 2>/dev/null || true
+          php ${MOKO_CLI}/manifest_read.php --path . --github-output 2>/dev/null || true
+
+      - name: "Determine version bump level"
+        id: bump
+        run: |
+          # Fix/patch branches: version was already bumped by pre-release, just strip suffix
+          # Feature/dev branches: bump minor for the new stable release
+          HEAD_REF="${{ github.event.pull_request.head.ref || 'dev' }}"
+          case "$HEAD_REF" in
+            fix/*|patch/*|hotfix/*|bugfix/*) BUMP="none" ;;
+            *)                               BUMP="minor" ;;
+          esac
+          echo "level=${BUMP}" >> "$GITHUB_OUTPUT"
+          echo "Bump level: ${BUMP} (from branch: ${HEAD_REF})"
 
       - name: "Publish stable release"
         run: |
-          php /tmp/moko-platform-api/cli/release_publish.php \
+          BUMP_FLAG=""
-            --path . --stability stable --bump minor --branch main \
+          if [ "${{ steps.bump.outputs.level }}" != "none" ]; then
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
+            BUMP_FLAG="--bump ${{ steps.bump.outputs.level }}"
-            --skip-update-stream
+          fi
+          php ${MOKO_CLI}/release_publish.php \
+            --path . --stability stable ${BUMP_FLAG} --branch main \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}"
 
+      - name: "Read published version"
+        id: version
+        run: |
+          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null || echo "")
+          VERSION=$(echo "$VERSION" | sed 's/-\(dev\|alpha\|beta\|rc\)$//')
+          [ -z "$VERSION" ] && VERSION="00.00.00" && echo "skip=true" >> "$GITHUB_OUTPUT"
+          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
+          echo "tag=stable" >> "$GITHUB_OUTPUT"
+          echo "release_tag=stable" >> "$GITHUB_OUTPUT"
+          echo "branch=main" >> "$GITHUB_OUTPUT"
+          echo "Published version: ${VERSION}"
+
+      - name: Update release notes and promote changelog
+        run: |
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
+
+          # Get the stable release info (version and ID)
+          RELEASE_JSON=$(curl -sf -H "Authorization: token ${TOKEN}" \
+            "${API_BASE}/releases/tags/stable" 2>/dev/null || echo '{}')
+          RELEASE_ID=$(python3 -c "import json,sys; print(json.load(sys.stdin).get('id',''))" <<< "$RELEASE_JSON" 2>/dev/null || true)
+          # Extract version from release name (e.g. "06.17.00" or "v06.17.00")
+          VERSION=$(python3 -c "
+          import json, sys, re
+          r = json.load(sys.stdin)
+          name = r.get('name', '')
+          m = re.search(r'(\d+\.\d+\.\d+)', name)
+          print(m.group(1) if m else '')
+          " <<< "$RELEASE_JSON" 2>/dev/null || true)
+
+          # Extract [Unreleased] section from changelog
+          NOTES=""
+          if [ -f "CHANGELOG.md" ]; then
+            NOTES=$(awk '/^## \[Unreleased\]/{found=1; next} /^## \[/{if(found) exit} found{print}' CHANGELOG.md)
+          fi
+          [ -z "$NOTES" ] && NOTES="Stable release"
+
+          # Update release body via API
+>>>>>>> main
+          if [ -n "$RELEASE_ID" ]; then
+            python3 -c "
+          import json, urllib.request
+          body = open('/dev/stdin').read()
+          payload = json.dumps({'body': body}).encode()
+          req = urllib.request.Request(
+              '${API_BASE}/releases/${RELEASE_ID}',
+              data=payload, method='PATCH',
+              headers={
+<<<<<<< HEAD
+                  'Authorization': 'token ${{ secrets.MOKOGITEA_TOKEN }}',
+=======
+                  'Authorization': 'token ${TOKEN}',
+>>>>>>> main
+                  'Content-Type': 'application/json'
+              })
+          urllib.request.urlopen(req)
+          " <<< "$NOTES"
+            echo "Release notes updated from CHANGELOG.md"
+          fi
+
+<<<<<<< HEAD
+=======
+          # Promote [Unreleased] → [version] in CHANGELOG.md and reset
+          if [ -n "$VERSION" ] && [ -f "CHANGELOG.md" ]; then
+            DATE=$(date +%Y-%m-%d)
+            python3 -c "
+          import sys
+          version, date = sys.argv[1], sys.argv[2]
+          content = open('CHANGELOG.md').read()
+          old = '## [Unreleased]'
+          new = f'## [Unreleased]\n\n## [{version}] --- {date}'
+          content = content.replace(old, new, 1)
+          open('CHANGELOG.md', 'w').write(content)
+          " "$VERSION" "$DATE"
+            git add CHANGELOG.md
+            git commit -m "chore: promote changelog [Unreleased] → [${VERSION}]" || true
+            git push origin main || true
+            echo "Changelog promoted: [Unreleased] → [${VERSION}]"
+          fi
+
+>>>>>>> main
       # -- STEP 9: Mirror to GitHub (stable only) --------------------------------
       - name: "Step 9: Mirror release to GitHub"
         if: >-
@@ -182,7 +390,7 @@ jobs:
           RELEASE_TAG="${{ steps.version.outputs.release_tag }}"
           GH_REPO="${{ vars.GH_MIRROR_REPO || github.repository }}"
           API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          php /tmp/moko-platform-api/cli/release_mirror.php \
+          php ${MOKO_CLI}/release_mirror.php \
             --version "$VERSION" --tag "$RELEASE_TAG" \
             --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
             --gh-token "${{ secrets.GH_MIRROR_TOKEN }}" --gh-repo "$GH_REPO" \
@@ -256,7 +464,7 @@ jobs:
         continue-on-error: true
         run: |
           API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          php /tmp/moko-platform-api/cli/version_reset_dev.php \
+          php ${MOKO_CLI}/version_reset_dev.php \
             --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "${API_BASE}" \
             --branch dev --path . 2>&1 || true
 

.mokogitea/workflows/branch-cleanup.yml

@@ -4,10 +4,10 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: MokoPlatform.Universal
+# INGROUP: MokoStandards.Universal
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 # PATH: /.mokogitea/workflows/branch-cleanup.yml
-# VERSION: 09.23.00
+# VERSION: 01.00.00
 # BRIEF: Delete feature branches after PR merge
 
 name: "Branch Cleanup"

.mokogitea/workflows/ci-generic.yml

@@ -0,0 +1,191 @@
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: MokoStandards.CI
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
+# PATH: /.gitea/workflows/ci-generic.yml
+# VERSION: 01.00.00
+# BRIEF: CI pipeline — lint, validate, and test for generic projects (PHP + Node.js)
+
+name: "Generic: Project CI"
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+jobs:
+  # ── Lint & Validate ───────────────────────────────────────────────────
+  lint:
+    name: Lint & Validate
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Detect toolchain
+        id: detect
+        run: |
+          HAS_PHP=false
+          HAS_NODE=false
+          [ -f "composer.json" ] && HAS_PHP=true
+          [ -f "package.json" ] && HAS_NODE=true
+          echo "has_php=$HAS_PHP" >> "$GITHUB_OUTPUT"
+          echo "has_node=$HAS_NODE" >> "$GITHUB_OUTPUT"
+          echo "Toolchain: PHP=$HAS_PHP Node=$HAS_NODE"
+
+      - name: Setup PHP
+        if: steps.detect.outputs.has_php == 'true'
+        run: |
+          if ! command -v php &> /dev/null; then
+            sudo apt-get update -qq
+            sudo apt-get install -y -qq php-cli php-mbstring php-xml >/dev/null 2>&1
+          fi
+          php -v
+
+      - name: Setup Node.js
+        if: steps.detect.outputs.has_node == 'true'
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install PHP dependencies
+        if: steps.detect.outputs.has_php == 'true'
+        run: |
+          if [ -f "composer.json" ]; then
+            composer install --no-interaction --prefer-dist --quiet 2>/dev/null || true
+          fi
+
+      - name: Install Node.js dependencies
+        if: steps.detect.outputs.has_node == 'true'
+        run: |
+          if [ -f "package.json" ]; then
+            npm ci --quiet 2>/dev/null || npm install --quiet 2>/dev/null || true
+          fi
+
+      - name: PHP syntax check
+        if: steps.detect.outputs.has_php == 'true'
+        run: |
+          ERRORS=0
+          while IFS= read -r -d '' file; do
+            if ! php -l "$file" 2>&1 | grep -q "No syntax errors"; then
+              echo "::error file=${file}::PHP syntax error"
+              ERRORS=$((ERRORS + 1))
+            fi
+          done < <(find . -name "*.php" -not -path "./.git/*" -not -path "./vendor/*" -not -path "./node_modules/*" -print0)
+
+          echo "## PHP Lint" >> $GITHUB_STEP_SUMMARY
+          if [ "$ERRORS" -eq 0 ]; then
+            echo "All PHP files passed syntax check." >> $GITHUB_STEP_SUMMARY
+          else
+            echo "${ERRORS} file(s) with syntax errors." >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+
+      - name: TypeScript/JavaScript lint
+        if: steps.detect.outputs.has_node == 'true'
+        run: |
+          if [ -f "node_modules/.bin/eslint" ]; then
+            npx eslint src/ --quiet 2>&1 || { echo "::error::ESLint errors found"; exit 1; }
+            echo "## ESLint" >> $GITHUB_STEP_SUMMARY
+            echo "All files passed ESLint." >> $GITHUB_STEP_SUMMARY
+          elif [ -f ".eslintrc.json" ] || [ -f ".eslintrc.js" ] || [ -f "eslint.config.js" ]; then
+            echo "::warning::ESLint config found but eslint not installed"
+          else
+            echo "No ESLint configured — skipping"
+          fi
+
+      - name: TypeScript compile check
+        if: steps.detect.outputs.has_node == 'true'
+        run: |
+          if [ -f "tsconfig.json" ] && [ -f "node_modules/.bin/tsc" ]; then
+            npx tsc --noEmit 2>&1 || { echo "::error::TypeScript compilation errors"; exit 1; }
+            echo "## TypeScript" >> $GITHUB_STEP_SUMMARY
+            echo "TypeScript compilation passed." >> $GITHUB_STEP_SUMMARY
+          fi
+
+      - name: PHPStan static analysis
+        if: steps.detect.outputs.has_php == 'true'
+        run: |
+          if [ -f "phpstan.neon" ] && [ -f "vendor/bin/phpstan" ]; then
+            vendor/bin/phpstan analyse --no-progress 2>&1 || { echo "::warning::PHPStan found issues"; }
+          fi
+
+  # ── Tests ─────────────────────────────────────────────────────────────
+  test:
+    name: Tests
+    runs-on: ubuntu-latest
+    needs: lint
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Detect toolchain
+        id: detect
+        run: |
+          HAS_PHP=false
+          HAS_NODE=false
+          [ -f "composer.json" ] && HAS_PHP=true
+          [ -f "package.json" ] && HAS_NODE=true
+          echo "has_php=$HAS_PHP" >> "$GITHUB_OUTPUT"
+          echo "has_node=$HAS_NODE" >> "$GITHUB_OUTPUT"
+
+      - name: Setup PHP
+        if: steps.detect.outputs.has_php == 'true'
+        run: |
+          if ! command -v php &> /dev/null; then
+            sudo apt-get update -qq
+            sudo apt-get install -y -qq php-cli php-mbstring php-xml >/dev/null 2>&1
+          fi
+
+      - name: Setup Node.js
+        if: steps.detect.outputs.has_node == 'true'
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install dependencies
+        run: |
+          [ -f "composer.json" ] && composer install --no-interaction --prefer-dist --quiet 2>/dev/null || true
+          [ -f "package.json" ] && { npm ci --quiet 2>/dev/null || npm install --quiet 2>/dev/null || true; }
+
+      - name: Run PHP tests
+        if: steps.detect.outputs.has_php == 'true'
+        run: |
+          if [ -f "vendor/bin/phpunit" ]; then
+            vendor/bin/phpunit --testdox 2>&1
+            echo "## PHPUnit" >> $GITHUB_STEP_SUMMARY
+            echo "Tests passed." >> $GITHUB_STEP_SUMMARY
+          elif [ -f "phpunit.xml" ] || [ -f "phpunit.xml.dist" ]; then
+            echo "::warning::PHPUnit config found but phpunit not installed"
+          else
+            echo "No PHPUnit configured — skipping"
+          fi
+
+      - name: Run Node.js tests
+        if: steps.detect.outputs.has_node == 'true'
+        run: |
+          if jq -e '.scripts.test' package.json > /dev/null 2>&1; then
+            npm test 2>&1
+            echo "## Node.js Tests" >> $GITHUB_STEP_SUMMARY
+            echo "Tests passed." >> $GITHUB_STEP_SUMMARY
+          else
+            echo "No test script in package.json — skipping"
+          fi
+
+      - name: Build check
+        run: |
+          if [ -f "Makefile" ]; then
+            make build 2>&1 || echo "::warning::Build failed or not configured"
+          elif [ -f "package.json" ] && jq -e '.scripts.build' package.json > /dev/null 2>&1; then
+            npm run build 2>&1 || echo "::warning::Build failed"
+          fi

.mokogitea/workflows/ci-platform.yml

@@ -4,18 +4,30 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.CI
+<<<<<<< HEAD
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# INGROUP: MokoCLI.CI
-# PATH: /.gitea/workflows/ci-platform.yml
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# PATH: /.mokogitea/workflows/ci-platform.yml
 # VERSION: 09.23.00
-# BRIEF: moko-platform CI — the standards engine validates itself
+# BRIEF: MokoCLI CI — the standards engine validates itself
+=======
+# INGROUP: mokoplatform.CI
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+# PATH: /.mokogitea/workflows/ci-platform.yml
+# VERSION: 09.23.00
+# BRIEF: mokoplatform CI — the standards engine validates itself
+>>>>>>> main
 #
 # +========================================================================+
-# |                  MOKO-PLATFORM CI                             |
+# |                  MOKOCLI CI                                    |
 # +========================================================================+
 # |                                                                        |
 # |  This is NOT a generic CI workflow. This is the self-validation        |
-# |  pipeline for the central moko-platform enterprise engine.           |
+<<<<<<< HEAD
+# |  pipeline for the central MokoCLI enterprise engine.           |
+=======
+# |  pipeline for the central mokoplatform enterprise engine.           |
+>>>>>>> main
 # |                                                                        |
 # |  It dogfoods every tool the platform ships to governed repos:          |
 # |                                                                        |
@@ -29,7 +41,11 @@
 # |                                                                        |
 # +========================================================================+
 
-name: "Platform: moko-platform CI"
+<<<<<<< HEAD
+name: "Platform: MokoCLI CI"
+=======
+name: "Platform: mokoplatform CI"
+>>>>>>> main
 
 on:
   push:
@@ -41,7 +57,7 @@ on:
     paths-ignore:
       - '**.md'
       - 'wiki/**'
-      - '.gitea/ISSUE_TEMPLATE/**'
+      - '.mokogitea/ISSUE_TEMPLATE/**'
   pull_request:
     branches:
       - main
@@ -104,7 +120,7 @@ jobs:
               echo "::error file=${file}::PHP syntax error"
               ERRORS=$((ERRORS + 1))
             fi
-          done < <(find lib/ validate/ automation/ cli/ src/ deploy/ -name "*.php" -print0 2>/dev/null)
+          done < <(find lib/ validate/ automation/ cli/ source/ src/ deploy/ -name "*.php" -print0 2>/dev/null)
 
           {
             echo "### PHP Syntax"
@@ -270,7 +286,7 @@ jobs:
               echo "::warning file=${file}::Missing SPDX header"
               MISSING=$((MISSING + 1))
             fi
-          done < <(find lib/ validate/ cli/ src/ automation/ deploy/ -name "*.php" -print0 2>/dev/null)
+          done < <(find lib/ validate/ cli/ source/ src/ automation/ deploy/ -name "*.php" -print0 2>/dev/null)
 
           {
             echo "### License Headers"
@@ -289,7 +305,7 @@ jobs:
               echo "::error file=${file}::Potential hardcoded secret detected"
               FOUND=$((FOUND + 1))
             fi
-          done < <(find lib/ validate/ cli/ src/ automation/ deploy/ -name "*.php" -print0 2>/dev/null)
+          done < <(find lib/ validate/ cli/ source/ src/ automation/ deploy/ -name "*.php" -print0 2>/dev/null)
 
           {
             echo "### Secret Detection"
@@ -412,10 +428,20 @@ jobs:
     if: always()
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: automation/ci-issue-reporter.sh
+          sparse-checkout-cone-mode: false
+
       - name: Check gate results
         run: |
           {
-            echo "# moko-platform CI"
+<<<<<<< HEAD
+            echo "# MokoCLI CI"
+=======
+            echo "# mokoplatform CI"
+>>>>>>> main
             echo ""
             echo "| Gate | Job | Status |"
             echo "|---|---|---|"
@@ -437,3 +463,46 @@ jobs:
             echo "::error::One or more CI gates failed"
             exit 1
           fi
+
+      - name: "File issues for failed gates"
+        if: >-
+          always() &&
+          (needs.code-quality.result == 'failure' ||
+           needs.tests.result == 'failure' ||
+           needs.self-health.result == 'failure' ||
+           needs.governance.result == 'failure' ||
+           needs.templates.result == 'failure')
+        env:
+          GITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+          GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+        run: |
+          chmod +x automation/ci-issue-reporter.sh
+          REPORTER="./automation/ci-issue-reporter.sh"
+          WF="Platform CI"
+
+          report_gate() {
+            local gate="$1" result="$2" details="$3"
+            if [ "$result" = "failure" ]; then
+              "$REPORTER" --gate "$gate" --details "$details" --workflow "$WF" --severity error
+            fi
+          }
+
+          report_gate "Code Quality" \
+            "${{ needs.code-quality.result }}" \
+            "PHPCS (PSR-12), PHPStan, or PHP syntax checks failed. Run \`composer check\` locally to reproduce."
+
+          report_gate "Unit Tests" \
+            "${{ needs.tests.result }}" \
+            "PHPUnit tests failed on one or more PHP versions (8.1, 8.2, 8.3). Run \`vendor/bin/phpunit --testdox\` locally."
+
+          report_gate "Self-Health" \
+            "${{ needs.self-health.result }}" \
+            "Self-health score fell below the 80% threshold. Run \`php bin/moko health -- --path .\` locally."
+
+          report_gate "Governance" \
+            "${{ needs.governance.result }}" \
+            "Governance checks failed (license headers, secrets, or version consistency). Check the CI run summary for specifics."
+
+          report_gate "Template Integrity" \
+            "${{ needs.templates.result }}" \
+            "Workflow or gitignore templates failed YAML validation or are missing required entries."

.mokogitea/workflows/cleanup.yml

@@ -4,10 +4,17 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Maintenance
+<<<<<<< HEAD
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# INGROUP: MokoCLI.Maintenance
-# PATH: /.gitea/workflows/cleanup.yml
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# PATH: /.mokogitea/workflows/cleanup.yml
 # VERSION: 09.23.00
+=======
+# INGROUP: MokoStandards.Maintenance
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
+# PATH: /.gitea/workflows/cleanup.yml
+# VERSION: 01.00.00
+>>>>>>> main
 # BRIEF: Scheduled cleanup — delete merged branches and old workflow runs
 
 name: "Universal: Repository Cleanup"
@@ -33,17 +40,17 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ secrets.MOKOGITEA_TOKEN }}
+          token: ${{ secrets.GA_TOKEN }}
 
       - name: Delete merged branches
         env:
-          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+          GA_TOKEN: ${{ secrets.GA_TOKEN }}
         run: |
           echo "=== Merged Branch Cleanup ==="
           API="${GITEA_URL}/api/v1/repos/${{ github.repository }}"
 
           # List branches via API
-          BRANCHES=$(curl -sS -H "Authorization: token ${GITEA_TOKEN}" \
+          BRANCHES=$(curl -sS -H "Authorization: token ${GA_TOKEN}" \
             "${API}/branches?limit=50" | jq -r '.[].name')
 
           DELETED=0
@@ -56,7 +63,7 @@ jobs:
             # Check if branch is merged into main
             if git merge-base --is-ancestor "origin/${BRANCH}" origin/main 2>/dev/null; then
               echo "  Deleting merged branch: ${BRANCH}"
-              curl -sS -X DELETE -H "Authorization: token ${GITEA_TOKEN}" \
+              curl -sS -X DELETE -H "Authorization: token ${GA_TOKEN}" \
                 "${API}/branches/${BRANCH}" 2>/dev/null || true
               DELETED=$((DELETED + 1))
             fi
@@ -66,20 +73,20 @@ jobs:
 
       - name: Clean old workflow runs
         env:
-          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+          GA_TOKEN: ${{ secrets.GA_TOKEN }}
         run: |
           echo "=== Workflow Run Cleanup ==="
           API="${GITEA_URL}/api/v1/repos/${{ github.repository }}"
           CUTOFF=$(date -d "30 days ago" +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || date -v-30d +%Y-%m-%dT%H:%M:%SZ)
 
           # Get old completed runs
-          RUNS=$(curl -sS -H "Authorization: token ${GITEA_TOKEN}" \
+          RUNS=$(curl -sS -H "Authorization: token ${GA_TOKEN}" \
             "${API}/actions/runs?status=completed&limit=50" | \
             jq -r ".workflow_runs[] | select(.created_at < \"${CUTOFF}\") | .id" 2>/dev/null)
 
           DELETED=0
           for RUN_ID in $RUNS; do
-            curl -sS -X DELETE -H "Authorization: token ${GITEA_TOKEN}" \
+            curl -sS -X DELETE -H "Authorization: token ${GA_TOKEN}" \
               "${API}/actions/runs/${RUN_ID}" 2>/dev/null || true
             DELETED=$((DELETED + 1))
           done

.mokogitea/workflows/deploy-manual.yml

@@ -0,0 +1,126 @@
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: MokoStandards.Deploy
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API
+# PATH: /templates/workflows/joomla/deploy-manual.yml.template
+# VERSION: 04.07.00
+# BRIEF: Manual SFTP deploy to dev server for Joomla repos
+
+name: "Universal: Deploy to Dev (Manual)"
+
+on:
+  workflow_dispatch:
+    inputs:
+      clear_remote:
+        description: 'Delete all remote files before uploading'
+        required: false
+        default: 'false'
+        type: boolean
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+    name: SFTP Deploy to Dev
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+
+      - name: Setup PHP
+        run: |
+          php -v && composer --version
+
+      - name: Setup MokoStandards tools
+        env:
+          GA_TOKEN: ${{ secrets.GA_TOKEN || secrets.GA_TOKEN || github.token }}
+          MOKO_CLONE_TOKEN: ${{ secrets.GA_TOKEN || secrets.GA_TOKEN || github.token }}
+          MOKO_CLONE_HOST: ${{ secrets.GA_TOKEN && 'git.mokoconsulting.tech/MokoConsulting' || 'github.com/mokoconsulting-tech' }}
+          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GA_TOKEN || github.token }}"}}'
+        run: |
+          git clone --depth 1 --branch main --quiet \
+            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/MokoStandards-API.git" \
+            /tmp/mokostandards-api 2>/dev/null || true
+          if [ -d "/tmp/mokostandards-api" ] && [ -f "/tmp/mokostandards-api/composer.json" ]; then
+            cd /tmp/mokostandards-api && composer install --no-dev --no-interaction --quiet 2>/dev/null || true
+          fi
+
+      - name: Check FTP configuration
+        id: check
+        env:
+          HOST: ${{ vars.DEV_FTP_HOST }}
+          PATH_VAR: ${{ vars.DEV_FTP_PATH }}
+          PORT: ${{ vars.DEV_FTP_PORT }}
+        run: |
+          if [ -z "$HOST" ] || [ -z "$PATH_VAR" ]; then
+            echo "DEV_FTP_HOST or DEV_FTP_PATH not configured -- cannot deploy"
+            echo "skip=true" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          echo "skip=false" >> "$GITHUB_OUTPUT"
+          echo "host=$HOST" >> "$GITHUB_OUTPUT"
+
+          REMOTE="${PATH_VAR%/}"
+          echo "remote=$REMOTE" >> "$GITHUB_OUTPUT"
+
+          [ -z "$PORT" ] && PORT="22"
+          echo "port=$PORT" >> "$GITHUB_OUTPUT"
+
+      - name: Deploy via SFTP
+        if: steps.check.outputs.skip != 'true'
+        env:
+          SFTP_KEY: ${{ secrets.DEV_FTP_KEY }}
+          SFTP_PASS: ${{ secrets.DEV_FTP_PASSWORD }}
+          SFTP_USER: ${{ vars.DEV_FTP_USERNAME }}
+        run: |
+          SOURCE_DIR="src"
+          [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs"
+          [ ! -d "$SOURCE_DIR" ] && { echo "No src/ or htdocs/ -- nothing to deploy"; exit 0; }
+
+          printf '{"host":"%s","port":%s,"username":"%s","remotePath":"%s"' \
+            "${{ steps.check.outputs.host }}" "${{ steps.check.outputs.port }}" "$SFTP_USER" "${{ steps.check.outputs.remote }}" \
+            > /tmp/sftp-config.json
+
+          if [ -n "$SFTP_KEY" ]; then
+            echo "$SFTP_KEY" > /tmp/deploy_key
+            chmod 600 /tmp/deploy_key
+            printf ',"privateKeyPath":"/tmp/deploy_key"}' >> /tmp/sftp-config.json
+          else
+            printf ',"password":"%s"}' "$SFTP_PASS" >> /tmp/sftp-config.json
+          fi
+
+          DEPLOY_ARGS=(--path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json)
+          [ "${{ inputs.clear_remote }}" = "true" ] && DEPLOY_ARGS+=(--clear-remote)
+
+          PLATFORM=$(php /tmp/mokostandards-api/cli/platform_detect.php --path . 2>/dev/null || true)
+          if [ "$PLATFORM" = "waas-component" ] && [ -f "/tmp/mokostandards-api/deploy/deploy-joomla.php" ]; then
+            php /tmp/mokostandards-api/deploy/deploy-joomla.php "${DEPLOY_ARGS[@]}"
+          else
+            php /tmp/mokostandards-api/deploy/deploy-sftp.php "${DEPLOY_ARGS[@]}"
+          fi
+
+          rm -f /tmp/deploy_key /tmp/sftp-config.json
+
+      - name: Summary
+        if: always()
+        run: |
+          if [ "${{ steps.check.outputs.skip }}" = "true" ]; then
+            echo "### Deploy Skipped -- FTP not configured" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "### Manual Dev Deploy Complete" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
+            echo "|-------|-------|" >> $GITHUB_STEP_SUMMARY
+            echo "| Host | \`${{ steps.check.outputs.host }}\` |" >> $GITHUB_STEP_SUMMARY
+            echo "| Remote | \`${{ steps.check.outputs.remote }}\` |" >> $GITHUB_STEP_SUMMARY
+            echo "| Clear | ${{ inputs.clear_remote }} |" >> $GITHUB_STEP_SUMMARY
+          fi

.mokogitea/workflows/gitleaks.yml

@@ -4,10 +4,15 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Security
+<<<<<<< HEAD
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform
+# INGROUP: MokoCLI.Security
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+# INGROUP: MokoStandards.Security
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/MokoStandards-API
+>>>>>>> main
 # PATH: /templates/workflows/gitleaks.yml.template
-# VERSION: 09.23.00
+# VERSION: 01.00.00
 # BRIEF: Secret scanning — detect leaked credentials, API keys, and tokens
 #
 # +========================================================================+
@@ -25,10 +30,6 @@
 name: "Universal: Secret Scanning"
 
 on:
-  pull_request:
-    branches:
-      - main
-      - 'dev/**'
   schedule:
     - cron: '0 5 * * 1'  # Weekly Monday 05:00 UTC
   workflow_dispatch:

.mokogitea/workflows/issue-branch.yml

@@ -4,8 +4,13 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Automation
+<<<<<<< HEAD
-# VERSION: 09.23.00
+# INGROUP: MokoCLI.Automation
+# VERSION: 09.25.05
+=======
+# INGROUP: mokocli.Automation
+# VERSION: 09.32.00
+>>>>>>> main
 # BRIEF: Auto-create feature branch when an issue is opened
 
 name: "Universal: Issue Branch"
@@ -28,7 +33,7 @@ jobs:
     steps:
       - name: Create branch and comment
         run: |
-          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
+          TOKEN="${{ secrets.GA_TOKEN }}"
           API="${GITEA_URL}/api/v1/repos/${{ github.repository }}"
           ISSUE_NUM="${{ github.event.issue.number }}"
           ISSUE_TITLE="${{ github.event.issue.title }}"

.mokogitea/workflows/notify.yml

@@ -4,10 +4,17 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Notifications
+<<<<<<< HEAD
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# INGROUP: MokoCLI.Notifications
-# PATH: /.gitea/workflows/notify.yml
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# PATH: /.mokogitea/workflows/notify.yml
 # VERSION: 09.23.00
+=======
+# INGROUP: MokoStandards.Notifications
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
+# PATH: /.gitea/workflows/notify.yml
+# VERSION: 01.00.00
+>>>>>>> main
 # BRIEF: Push notifications via ntfy on release success or workflow failure
 
 name: "Universal: Notifications"

.mokogitea/workflows/pr-check.yml

@@ -4,8 +4,8 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.CI
+# INGROUP: MokoCLI.CI
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 # PATH: /templates/workflows/universal/pr-check.yml.template
 # VERSION: 09.23.00
 # BRIEF: PR gate — branch policy + code validation before merge
@@ -96,6 +96,32 @@ jobs:
           echo "Branch policy: OK (${HEAD} → ${BASE})"
           echo "## Branch Policy: Passed" >> $GITHUB_STEP_SUMMARY
 
+  # ── Secret Scanning ──────────────────────────────────────────────────
+  gitleaks:
+    name: Secret Scan
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install Gitleaks
+        run: |
+          GITLEAKS_VERSION="8.21.2"
+          curl -sSL "https://github.com/gitleaks/gitleaks/releases/download/v${GITLEAKS_VERSION}/gitleaks_${GITLEAKS_VERSION}_linux_x64.tar.gz" \
+            | tar -xz -C /usr/local/bin gitleaks
+
+      - name: Scan PR commits for secrets
+        run: |
+          if gitleaks detect --source . --verbose \
+            --log-opts=${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} 2>&1; then
+            echo "**No secrets detected.**" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "::error::Potential secrets detected in PR commits"
+            exit 1
+          fi
+
   # ── Code Validation ────────────────────────────────────────────────────
   validate:
     name: Validate PR

.mokogitea/workflows/pre-release.yml

@@ -4,19 +4,30 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Release
+<<<<<<< HEAD
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# INGROUP: MokoCLI.Release
+=======
+# INGROUP: mokocli.Release
+>>>>>>> main
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 # PATH: /templates/workflows/universal/pre-release.yml.template
-# VERSION: 09.23.00
+# VERSION: 05.01.00
-# BRIEF: Manual pre-release -- builds dev/alpha/beta/rc packages from any branch
+# BRIEF: Auto pre-release on push to dev/alpha/beta/rc branches
 
 name: "Universal: Pre-Release"
 
 on:
-  pull_request:
+  push:
-    types: [closed]
     branches:
       - dev
+      - 'fix/**'
+      - 'patch/**'
+      - 'hotfix/**'
+      - 'bugfix/**'
+      - 'chore/**'
+      - alpha
+      - beta
+      - rc
   workflow_dispatch:
     inputs:
       stability:
@@ -39,11 +50,11 @@ env:
 
 jobs:
   build:
-    name: "Build Pre-Release (${{ inputs.stability || 'development' }})"
+    name: "Build Pre-Release (${{ inputs.stability || github.ref_name }})"
     runs-on: release
     if: >-
       github.event_name == 'workflow_dispatch' ||
-      (github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'dev')
+      github.event_name == 'push'
 
     steps:
       - name: Checkout
@@ -51,56 +62,97 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.MOKOGITEA_TOKEN }}
+          ref: ${{ github.ref_name }}
 
-      - name: Setup moko-platform tools
+<<<<<<< HEAD
+      - name: Setup MokoCLI tools
+=======
+      - name: Setup mokocli tools
+>>>>>>> main
         env:
           MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
           MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
         run: |
-          if ! command -v composer &> /dev/null; then
+<<<<<<< HEAD
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+          # Check both new (mokocli) and legacy (mokoplatform) install paths
+          if [ -f /opt/mokocli/cli/version_bump.php ] && [ -f /opt/mokocli/cli/manifest_element.php ] && [ -f /opt/mokocli/vendor/autoload.php ]; then
+            echo "Using pre-installed /opt/mokocli"
+            echo MOKO_CLI=/opt/mokocli/cli >> $GITHUB_ENV
+          elif [ -f /opt/mokoplatform/cli/version_bump.php ] && [ -f /opt/mokoplatform/vendor/autoload.php ]; then
+            echo "Using pre-installed /opt/mokoplatform (legacy path)"
+            echo MOKO_CLI=/opt/mokoplatform/cli >> $GITHUB_ENV
+          else
+            echo "Falling back to fresh clone"
+=======
+          # Use pre-installed /opt/mokocli if available (updated by cron every 6h)
+          if [ -f /opt/mokocli/cli/version_bump.php ] && [ -f /opt/mokocli/cli/manifest_element.php ] && [ -f /opt/mokocli/vendor/autoload.php ]; then
+            echo Using pre-installed /opt/mokocli
+            echo MOKO_CLI=/opt/mokocli/cli >> $GITHUB_ENV
+          else
+            echo Falling back to fresh clone
+>>>>>>> main
+            if ! command -v composer > /dev/null 2>&1; then
+              sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer > /dev/null 2>&1
+            fi
+            rm -rf /tmp/mokocli
+            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/mokocli.git
+            git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/mokocli
+            cd /tmp/mokocli && composer install --no-dev --no-interaction --quiet
+            echo MOKO_CLI=/tmp/mokocli/cli >> $GITHUB_ENV
           fi
-          # Always fetch latest CLI tools — never use stale cache from previous runs
-          rm -rf /tmp/moko-platform-api
-          git clone --depth 1 --branch main --quiet \
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
-            /tmp/moko-platform-api
-          cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet
-          echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV"
 
       - name: Detect platform
         id: platform
         run: |
+          # Auto-detect and update platform if not set in manifest
+          php ${MOKO_CLI}/platform_detect.php --path . --github-output 2>/dev/null || true
           php ${MOKO_CLI}/manifest_read.php --path . --github-output
 
       - name: Resolve metadata and bump version
         id: meta
         run: |
-          STABILITY="${{ inputs.stability || 'development' }}"
+          # Auto-detect stability from branch name on push, or use input on dispatch
+          if [ "${{ github.event_name }}" = "push" ]; then
+            case "${{ github.ref_name }}" in
+              rc)    STABILITY="release-candidate" ;;
+              alpha) STABILITY="alpha" ;;
+              beta)  STABILITY="beta" ;;
+              *)     STABILITY="development" ;;
+            esac
+          else
+            STABILITY="${{ inputs.stability || 'development' }}"
+          fi
 
           case "$STABILITY" in
-            development)        TAG="development" ;;
+            development)        SUFFIX="-dev";   TAG="development" ;;
-            alpha)              TAG="alpha" ;;
+            alpha)              SUFFIX="-alpha"; TAG="alpha" ;;
-            beta)               TAG="beta" ;;
+            beta)               SUFFIX="-beta";  TAG="beta" ;;
-            release-candidate)  TAG="release-candidate" ;;
+            release-candidate)  SUFFIX="-rc";    TAG="release-candidate" ;;
           esac
 
-          # Bump version: patch for dev/alpha/beta, minor for RC
+          # Bump version via CLI: patch for dev/alpha/beta, minor for RC
           case "$STABILITY" in
-            release-candidate) php ${MOKO_CLI}/version_bump.php --path . --minor 2>/dev/null || true ;;
+            release-candidate) BUMP="minor" ;;
-            *)                 php ${MOKO_CLI}/version_bump.php --path . 2>/dev/null || true ;;
+            *)                 BUMP="patch" ;;
           esac
 
-          # Set stability suffix and fix consistency
+          php ${MOKO_CLI}/version_bump.php --path . $([ "$BUMP" = "minor" ] && echo "--minor") 2>/dev/null || true
-          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null || echo '00.00.01')
+
+          # Set stability suffix and verify consistency
+          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null || echo "00.00.01")
           VERSION=$(echo "$VERSION" | sed 's/-\(dev\|alpha\|beta\|rc\)$//')
+
           php ${MOKO_CLI}/version_set_platform.php \
             --path . --version "$VERSION" --branch "${{ github.ref_name }}" --stability "$STABILITY" 2>/dev/null || true
           php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true
 
-          # Read final version with suffix
+          # Ensure licensing tags (updateservers, dlid) if enabled in manifest.xml
-          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null)
+          php ${MOKO_CLI}/manifest_licensing.php --path . --fix 2>/dev/null || true
-          [ -z "$VERSION" ] && VERSION="00.00.01"
+
+          # Append suffix for output
+          if [ -n "$SUFFIX" ]; then
+            VERSION="${VERSION}${SUFFIX}"
+          fi
 
           # Commit version bump
           git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
@@ -125,11 +177,12 @@ jobs:
 
           echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
           echo "stability=${STABILITY}" >> "$GITHUB_OUTPUT"
+          echo "suffix=${SUFFIX}" >> "$GITHUB_OUTPUT"
           echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
           echo "zip_name=${ZIP_NAME}" >> "$GITHUB_OUTPUT"
           echo "ext_element=${EXT_ELEMENT}" >> "$GITHUB_OUTPUT"
 
-          echo "=== Pre-Release: ${EXT_ELEMENT} ${VERSION} ==="
+          echo "=== Pre-Release: ${EXT_ELEMENT} ${VERSION}${SUFFIX} ==="
 
       - name: Create release
         id: release
@@ -140,7 +193,42 @@ jobs:
           php ${MOKO_CLI}/release_create.php \
             --path . --version "$VERSION" --tag "$TAG" \
             --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
-            --repo "${GITEA_REPO}" --branch dev --prerelease
+            --repo "${GITEA_REPO}" --branch "${{ github.ref_name }}" --prerelease
+
+      - name: Update release notes from CHANGELOG.md
+        run: |
+          TAG="${{ steps.meta.outputs.tag }}"
+          VERSION="${{ steps.meta.outputs.version }}"
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+
+          # Extract [Unreleased] section from changelog (everything between [Unreleased] and next ## heading)
+          if [ -f "CHANGELOG.md" ]; then
+            NOTES=$(awk '/^## \[Unreleased\]/{found=1; next} /^## \[/{if(found) exit} found{print}' CHANGELOG.md)
+            [ -z "$NOTES" ] && NOTES="Release ${VERSION}"
+          else
+            NOTES="Release ${VERSION}"
+          fi
+
+          # Update release body via API
+          RELEASE_ID=$(curl -sf -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
+            "${API_BASE}/releases/tags/${TAG}" | python3 -c "import json,sys; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || true)
+
+          if [ -n "$RELEASE_ID" ]; then
+            python3 -c "
+          import json, urllib.request
+          body = open('/dev/stdin').read()
+          payload = json.dumps({'body': body}).encode()
+          req = urllib.request.Request(
+              '${API_BASE}/releases/${RELEASE_ID}',
+              data=payload, method='PATCH',
+              headers={
+                  'Authorization': 'token ${{ secrets.MOKOGITEA_TOKEN }}',
+                  'Content-Type': 'application/json'
+              })
+          urllib.request.urlopen(req)
+          " <<< "$NOTES"
+            echo "Release notes updated from CHANGELOG.md"
+          fi
 
       - name: Build package and upload
         id: package

.mokogitea/workflows/rc-revert.yml

@@ -0,0 +1,66 @@
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: mokocli.Universal
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# PATH: /.mokogitea/workflows/rc-revert.yml
+# VERSION: 09.23.00
+# BRIEF: Rename rc/ branch back to dev/ when PR is closed without merge
+
+name: "RC Revert"
+
+on:
+  pull_request:
+    types: [closed]
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+jobs:
+  revert:
+    name: Rename rc/ back to dev/
+    runs-on: ubuntu-latest
+    if: >-
+      github.event.pull_request.merged == false &&
+      startsWith(github.event.pull_request.head.ref, 'rc/')
+
+    steps:
+      - name: Rename branch
+        run: |
+          BRANCH="${{ github.event.pull_request.head.ref }}"
+          SUFFIX="${BRANCH#rc/}"
+          DEV_BRANCH="dev/${SUFFIX}"
+          API="${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}/api/v1/repos/${{ github.repository }}/branches"
+          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
+
+          # Create dev/ branch from rc/ branch
+          STATUS=$(curl -sf -o /dev/null -w "%{http_code}" -X POST \
+            -H "Authorization: token ${TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "{\"new_branch_name\": \"${DEV_BRANCH}\", \"old_branch_name\": \"${BRANCH}\"}" \
+            "${API}" 2>/dev/null || true)
+
+          if [ "$STATUS" = "201" ]; then
+            echo "Created branch: ${DEV_BRANCH}" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "::error::Failed to create ${DEV_BRANCH} from ${BRANCH} (HTTP ${STATUS})"
+            exit 1
+          fi
+
+          # Delete rc/ branch
+          ENCODED=$(php -r "echo rawurlencode('${BRANCH}');")
+          STATUS=$(curl -sf -o /dev/null -w "%{http_code}" -X DELETE \
+            -H "Authorization: token ${TOKEN}" \
+            "${API}/${ENCODED}" 2>/dev/null || true)
+
+          if [ "$STATUS" = "204" ]; then
+            echo "Deleted branch: ${BRANCH}" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "::warning::Failed to delete ${BRANCH} (HTTP ${STATUS})"
+          fi
+
+          echo "### RC Reverted" >> $GITHUB_STEP_SUMMARY
+          echo "${BRANCH} → ${DEV_BRANCH}" >> $GITHUB_STEP_SUMMARY

.mokogitea/workflows/repo-health.yml

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # ============================================================================
 # Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
 #
@@ -7,8 +8,8 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Validation
+# INGROUP: MokoCLI.Validation
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 # PATH: /templates/workflows/joomla/repo_health.yml.template
 # VERSION: 09.23.00
 # BRIEF: Enforces repository guardrails by validating scripts governance, tooling availability, and core repository health artifacts.
@@ -247,6 +248,721 @@ jobs:
             printf '\n'
           } >> "${GITHUB_STEP_SUMMARY}"
 
+  repo_health:
+    name: Repository health
+    needs: access_check
+    if: ${{ needs.access_check.outputs.allowed == 'true' }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          fetch-depth: 0
+
+      - name: Repository health checks
+        env:
+          PROFILE_RAW: ${{ github.event.inputs.profile }}
+        run: |
+          set -euo pipefail
+
+          profile="${PROFILE_RAW:-all}"
+          case "${profile}" in
+            all|scripts|repo) ;;
+            *)
+              printf '%s\n' "ERROR: Unknown profile: ${profile}" >> "${GITHUB_STEP_SUMMARY}"
+              exit 1
+              ;;
+          esac
+
+          if [ "${profile}" = 'scripts' ]; then
+            {
+              printf '%s\n' '### Repository health'
+              printf '%s\n' "Profile: ${profile}"
+              printf '%s\n' 'Status: SKIPPED'
+              printf '%s\n' 'Reason: profile excludes repository health'
+              printf '\n'
+            } >> "${GITHUB_STEP_SUMMARY}"
+            exit 0
+          fi
+
+          IFS=',' read -r -a required_artifacts <<< "${REPO_REQUIRED_ARTIFACTS}"
+          IFS=',' read -r -a optional_files <<< "${REPO_OPTIONAL_FILES}"
+          if [ -n "${REPO_DISALLOWED_DIRS:-}" ]; then IFS=',' read -r -a disallowed_dirs <<< "${REPO_DISALLOWED_DIRS}"; else disallowed_dirs=(); fi
+          IFS=',' read -r -a disallowed_files <<< "${REPO_DISALLOWED_FILES:-}"
+
+          missing_required=()
+          missing_optional=()
+
+          # Source directory: source/, src/, or htdocs/ (any is valid for extension repos)
+          SOURCE_DIR=""
+          if [ -d "source" ]; then
+            SOURCE_DIR="source"
+          elif [ -d "src" ]; then
+            SOURCE_DIR="src"
+          elif [ -d "htdocs" ]; then
+            SOURCE_DIR="htdocs"
+          elif [ -d "deploy" ] || [ -d "cli" ] || [ -d "monitoring" ]; then
+            # Platform/tooling repos don't need source/
+            SOURCE_DIR=""
+          else
+            missing_required+=("source/ or src/ or htdocs/ (source directory required)")
+          fi
+
+          for item in "${required_artifacts[@]}"; do
+            if printf '%s' "${item}" | grep -q '/$'; then
+              d="${item%/}"
+              [ ! -d "${d}" ] && missing_required+=("${item}")
+            else
+              [ ! -f "${item}" ] && missing_required+=("${item}")
+            fi
+          done
+
+          for f in "${optional_files[@]}"; do
+            if printf '%s' "${f}" | grep -q '/$'; then
+              d="${f%/}"
+              [ ! -d "${d}" ] && missing_optional+=("${f}")
+            else
+              [ ! -f "${f}" ] && missing_optional+=("${f}")
+            fi
+          done
+
+          for d in "${disallowed_dirs[@]}"; do
+            d_norm="${d%/}"
+            [ -d "${d_norm}" ] && missing_required+=("${d_norm}/ (disallowed)")
+          done
+
+          for f in "${disallowed_files[@]}"; do
+            [ -f "${f}" ] && missing_required+=("${f} (disallowed)")
+          done
+
+          git fetch origin --prune
+
+          dev_paths=()
+          dev_branches=()
+
+          while IFS= read -r b; do
+            name="${b#origin/}"
+            if [ "${name}" = 'dev' ]; then
+              dev_branches+=("${name}")
+            else
+              dev_paths+=("${name}")
+            fi
+          done < <(git branch -r --list 'origin/dev*' | sed 's/^ *//')
+
+          if [ "${#dev_paths[@]}" -eq 0 ] && [ "${#dev_branches[@]}" -eq 0 ]; then
+            missing_required+=("dev or dev/* branch")
+          fi
+
+          content_warnings=()
+
+          if [ -f 'CHANGELOG.md' ] && ! grep -Eq '^# Changelog' CHANGELOG.md; then
+            content_warnings+=("CHANGELOG.md missing '# Changelog' header")
+          fi
+
+          if [ -f 'CHANGELOG.md' ] && grep -Eq '^[# ]*Unreleased' CHANGELOG.md; then
+            content_warnings+=("CHANGELOG.md contains Unreleased section (review release readiness)")
+          fi
+
+          if [ -f 'LICENSE' ] && ! grep -qiE 'GNU GENERAL PUBLIC LICENSE|GPL' LICENSE; then
+            content_warnings+=("LICENSE does not look like a GPL text")
+          fi
+
+          if [ -f 'README.md' ] && ! grep -qiE 'moko|Moko' README.md; then
+            content_warnings+=("README.md missing expected brand keyword")
+          fi
+
+          export PROFILE_RAW="${profile}"
+          export MISSING_REQUIRED="$(printf '%s\n' "${missing_required[@]:-}")"
+          export MISSING_OPTIONAL="$(printf '%s\n' "${missing_optional[@]:-}")"
+          export CONTENT_WARNINGS="$(printf '%s\n' "${content_warnings[@]:-}")"
+
+          report_json=$(printf '{"profile":"%s","missing_required":%d,"missing_optional":%d,"content_warnings":%d}'             "$profile" "${#missing_required[@]}" "${#missing_optional[@]}" "${#content_warnings[@]}")
+
+          {
+            printf '%s\n' '### Repository health'
+            printf '%s\n' "Profile: ${profile}"
+            printf '%s\n' '| Metric | Value |'
+            printf '%s\n' '|---|---|'
+            printf '%s\n' "| Missing required | ${#missing_required[@]} |"
+            printf '%s\n' "| Missing optional | ${#missing_optional[@]} |"
+            printf '%s\n' "| Content warnings | ${#content_warnings[@]} |"
+            printf '\n'
+
+            printf '%s\n' '### Guardrails report (JSON)'
+            printf '%s\n' '```json'
+            printf '%s\n' "${report_json}"
+            printf '%s\n' '```'
+            printf '\n'
+          } >> "${GITHUB_STEP_SUMMARY}"
+
+          if [ "${#missing_required[@]}" -gt 0 ]; then
+            {
+              printf '%s\n' '### Missing required repo artifacts'
+              for m in "${missing_required[@]}"; do printf '%s\n' "- ${m}"; done
+              printf '%s\n' 'ERROR: Guardrails failed. Missing required repository artifacts.'
+              printf '\n'
+            } >> "${GITHUB_STEP_SUMMARY}"
+            exit 1
+          fi
+
+          if [ "${#missing_optional[@]}" -gt 0 ]; then
+            {
+              printf '%s\n' '### Missing optional repo artifacts'
+              for m in "${missing_optional[@]}"; do printf '%s\n' "- ${m}"; done
+              printf '\n'
+            } >> "${GITHUB_STEP_SUMMARY}"
+          fi
+
+          if [ "${#content_warnings[@]}" -gt 0 ]; then
+            {
+              printf '%s\n' '### Repo content warnings'
+              for m in "${content_warnings[@]}"; do printf '%s\n' "- ${m}"; done
+              printf '\n'
+            } >> "${GITHUB_STEP_SUMMARY}"
+          fi
+
+          # -- Joomla-specific checks --
+          joomla_findings=()
+
+          MANIFEST="$(find . -maxdepth 2 -name '*.xml' -exec grep -l '<extension' {} \; 2>/dev/null | head -1 || true)"
+          if [ -z "${MANIFEST}" ]; then
+            joomla_findings+=("Joomla XML manifest not found (no *.xml with <extension> tag)")
+          else
+            if ! grep -qP '<version>' "${MANIFEST}"; then
+              joomla_findings+=("XML manifest: <version> tag missing")
+            fi
+            if ! grep -qP 'type="(component|module|plugin|library|package|template|language)"' "${MANIFEST}"; then
+              joomla_findings+=("XML manifest: type attribute missing or invalid")
+            fi
+            if ! grep -qP '<name>' "${MANIFEST}"; then
+              joomla_findings+=("XML manifest: <name> tag missing")
+            fi
+            if ! grep -qP '<author>' "${MANIFEST}"; then
+              joomla_findings+=("XML manifest: <author> tag missing")
+            fi
+            if ! grep -qP '<namespace' "${MANIFEST}"; then
+              joomla_findings+=("XML manifest: <namespace> missing (required for Joomla 5+)")
+            fi
+          fi
+
+          INI_COUNT="$(find . -name '*.ini' -type f 2>/dev/null | wc -l)"
+          if [ "${INI_COUNT}" -eq 0 ]; then
+            joomla_findings+=("No .ini language files found")
+          fi
+
+          if [ ! -f 'updates.xml' ]; then
+            joomla_findings+=("updates.xml missing in root (required for Joomla update server)")
+          fi
+
+          if [ -n "${SOURCE_DIR}" ]; then
+            INDEX_DIRS=("${SOURCE_DIR}" "${SOURCE_DIR}/admin" "${SOURCE_DIR}/site")
+            for dir in "${INDEX_DIRS[@]}"; do
+              if [ -d "${dir}" ] && [ ! -f "${dir}/index.html" ]; then
+                joomla_findings+=("${dir}/index.html missing (directory listing protection)")
+              fi
+            done
+          fi
+
+          if [ "${#joomla_findings[@]}" -gt 0 ]; then
+            {
+              printf '%s\n' '### Joomla extension checks'
+              printf '%s\n' '| Check | Status |'
+              printf '%s\n' '|---|---|'
+              for f in "${joomla_findings[@]}"; do
+                printf '%s\n' "| ${f} | Warning |"
+              done
+              printf '\n'
+            } >> "${GITHUB_STEP_SUMMARY}"
+          else
+            {
+              printf '%s\n' '### Joomla extension checks'
+              printf '%s\n' 'All Joomla-specific checks passed.'
+              printf '\n'
+            } >> "${GITHUB_STEP_SUMMARY}"
+          fi
+
+          extended_enabled="${EXTENDED_CHECKS:-true}"
+          extended_findings=()
+
+          if [ "${extended_enabled}" = 'true' ]; then
+            if [ -f '.github/CODEOWNERS' ] || [ -f 'CODEOWNERS' ] || [ -f 'docs/CODEOWNERS' ]; then
+              :
+            else
+              extended_findings+=("CODEOWNERS not found (.github/CODEOWNERS preferred)")
+            fi
+
+            if ls "${WORKFLOWS_DIR}"/*.yml >/dev/null 2>&1 || ls "${WORKFLOWS_DIR}"/*.yaml >/dev/null 2>&1; then
+              bad_refs="$(grep -RIn --include='*.yml' --include='*.yaml' -E '^[[:space:]]*uses:[[:space:]]*[^#]+@(main|master)\b' "${WORKFLOWS_DIR}" 2>/dev/null || true)"
+              if [ -n "${bad_refs}" ]; then
+                extended_findings+=("Workflows reference actions @main/@master (pin versions): see log excerpt")
+                {
+                  printf '%s\n' '### Workflow pinning advisory'
+                  printf '%s\n' 'Found uses: entries pinned to main/master:'
+                  printf '%s\n' '```'
+                  printf '%s\n' "${bad_refs}"
+                  printf '%s\n' '```'
+                  printf '\n'
+                } >> "${GITHUB_STEP_SUMMARY}"
+              fi
+            fi
+
+            if [ -f "${DOCS_INDEX}" ]; then
+              missing_links=""
+              while IFS= read -r docline; do
+                for link in $(echo "$docline" | grep -oE '\]\([^)]+\)' | sed 's/\](//' | sed 's/)$//' || true); do
+                  case "$link" in http://*|https://*|"#"*|mailto:*) continue ;; esac
+                  linkpath="${link%%#*}"
+                  linkpath="${linkpath%%\?*}"
+                  [ -z "$linkpath" ] && continue
+                  if [ "${linkpath:0:1}" = "/" ]; then
+                    testpath="${linkpath#/}"
+                  else
+                    testpath="$(dirname "${DOCS_INDEX}")/${linkpath}"
+                  fi
+                  [ ! -e "$testpath" ] && missing_links="${missing_links}${testpath} "
+                done
+              done < "${DOCS_INDEX}"
+              if [ -n "${missing_links}" ]; then
+                extended_findings+=("docs/docs-index.md contains broken relative links")
+                {
+                  printf '%s\n' '### Docs index link integrity'
+                  printf '%s\n' 'Broken relative links:'
+                  for bl in ${missing_links}; do
+                    printf '%s\n' "- ${bl}"
+                  done
+                  printf '\n'
+                } >> "${GITHUB_STEP_SUMMARY}"
+              fi
+            fi
+
+            if [ -d "${SCRIPT_DIR}" ]; then
+              if ! command -v shellcheck >/dev/null 2>&1; then
+                sudo apt-get update -qq
+                sudo apt-get install -y shellcheck >/dev/null
+              fi
+
+              sc_out=''
+              while IFS= read -r shf; do
+                [ -z "${shf}" ] && continue
+                out_one="$(shellcheck -S warning -x "${shf}" 2>/dev/null || true)"
+                if [ -n "${out_one}" ]; then
+                  sc_out="${sc_out}${out_one}\n"
+                fi
+              done < <(find "${SCRIPT_DIR}" -type f -name "${SHELLCHECK_PATTERN}" 2>/dev/null | sort)
+
+              if [ -n "${sc_out}" ]; then
+                extended_findings+=("ShellCheck warnings detected (advisory)")
+                sc_head="$(printf '%s' "${sc_out}" | head -n 200)"
+                {
+                  printf '%s\n' '### ShellCheck (advisory)'
+                  printf '%s\n' '```'
+                  printf '%s\n' "${sc_head}"
+                  printf '%s\n' '```'
+                  printf '\n'
+                } >> "${GITHUB_STEP_SUMMARY}"
+              fi
+            fi
+
+            spdx_missing=()
+            IFS=',' read -r -a spdx_globs <<< "${SPDX_FILE_GLOBS}"
+            spdx_args=()
+            for g in "${spdx_globs[@]}"; do spdx_args+=("${g}"); done
+
+            while IFS= read -r f; do
+              [ -z "${f}" ] && continue
+              if ! head -n 40 "${f}" | grep -q 'SPDX-License-Identifier:'; then
+                spdx_missing+=("${f}")
+              fi
+            done < <(git ls-files "${spdx_args[@]}" 2>/dev/null || true)
+
+            if [ "${#spdx_missing[@]}" -gt 0 ]; then
+              extended_findings+=("SPDX header missing in some tracked files (advisory)")
+              {
+                printf '%s\n' '### SPDX header advisory'
+                printf '%s\n' 'Files missing SPDX-License-Identifier (first 40 lines scan):'
+                for f in "${spdx_missing[@]}"; do printf '%s\n' "- ${f}"; done
+                printf '\n'
+              } >> "${GITHUB_STEP_SUMMARY}"
+            fi
+
+            stale_cutoff_days=180
+            stale_branches="$(git for-each-ref --format='%(refname:short) %(committerdate:unix)' refs/remotes/origin 2>/dev/null | awk -v now="$(date +%s)" -v days="${stale_cutoff_days}" '{if (now-$2 > days*86400) print $1}' | head -50)"
+            if [ -n "${stale_branches}" ]; then
+              extended_findings+=("Stale remote branches detected (advisory)")
+              {
+                printf '%s\n' '### Git hygiene advisory'
+                printf '%s\n' "Branches with last commit older than ${stale_cutoff_days} days (sample up to 50):"
+                while IFS= read -r b; do [ -n "${b}" ] && printf '%s\n' "- ${b}"; done <<< "${stale_branches}"
+                printf '\n'
+              } >> "${GITHUB_STEP_SUMMARY}"
+            fi
+          fi
+
+          {
+            printf '%s\n' '### Guardrails coverage matrix'
+            printf '%s\n' '| Domain | Status | Notes |'
+            printf '%s\n' '|---|---|---|'
+            printf '%s\n' '| Access control | OK | Admin-only execution gate |'
+            printf '%s\n' '| Release policy | N/A | Releases handled by MokoGitea |'
+            printf '%s\n' '| Scripts governance | OK | Directory policy and advisory reporting |'
+            printf '%s\n' '| Repo required artifacts | OK | Required, optional, disallowed enforcement |'
+            printf '%s\n' '| Repo content heuristics | OK | Brand, license, changelog structure |'
+            if [ "${extended_enabled}" = 'true' ]; then
+              if [ "${#extended_findings[@]}" -gt 0 ]; then
+                printf '%s\n' '| Extended checks | Warning | See extended findings below |'
+              else
+                printf '%s\n' '| Extended checks | OK | No findings |'
+              fi
+            else
+              printf '%s\n' '| Extended checks | SKIPPED | EXTENDED_CHECKS disabled |'
+            fi
+            printf '\n'
+          } >> "${GITHUB_STEP_SUMMARY}"
+
+          if [ "${extended_enabled}" = 'true' ] && [ "${#extended_findings[@]}" -gt 0 ]; then
+            {
+              printf '%s\n' '### Extended findings (advisory)'
+              for f in "${extended_findings[@]}"; do printf '%s\n' "- ${f}"; done
+              printf '\n'
+            } >> "${GITHUB_STEP_SUMMARY}"
+          fi
+
+          printf '%s\n' 'Repository health guardrails passed.' >> "${GITHUB_STEP_SUMMARY}"
+
+
+  site-health:
+    name: Site Health
+    runs-on: ubuntu-latest
+    if: github.event_name == 'workflow_dispatch'
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.3'
+
+      - name: Uptime check
+        if: env.URLS != ''
+        run: |
+          echo "$URLS" > /tmp/urls.txt
+          php monitoring/uptime-probe.php --urls /tmp/urls.txt --timeout 15 || echo "::warning::Some sites are down"
+          rm -f /tmp/urls.txt
+        env:
+          URLS: ${{ vars.MONITORED_URLS }}
+
+      - name: SSL certificate check
+        if: env.DOMAINS != ''
+        run: |
+          echo "$DOMAINS" > /tmp/domains.txt
+          php monitoring/ssl-check.php --domains /tmp/domains.txt --warn-days 30 || echo "::warning::SSL certificates expiring soon"
+          rm -f /tmp/domains.txt
+        env:
+          DOMAINS: ${{ vars.MONITORED_DOMAINS }}
+
+      - name: Summary
+        if: always()
+        run: |
+          echo "### Site Health" >> $GITHUB_STEP_SUMMARY
+          echo "Uptime and SSL checks completed." >> $GITHUB_STEP_SUMMARY
+
+  # ═══════════════════════════════════════════════════════════════════════
+  # Issue Reporter — file issues for failed gates
+  # ═══════════════════════════════════════════════════════════════════════
+  report-issues:
+    name: "Report Issues"
+    runs-on: ubuntu-latest
+    needs: [access_check, scripts_governance, repo_health]
+    if: >-
+      always() &&
+      (needs.scripts_governance.result == 'failure' ||
+       needs.repo_health.result == 'failure')
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: automation/ci-issue-reporter.sh
+          sparse-checkout-cone-mode: false
+
+      - name: "File issues for failed gates"
+        env:
+          GITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+          GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+        run: |
+          chmod +x automation/ci-issue-reporter.sh
+          REPORTER="./automation/ci-issue-reporter.sh"
+          WF="Repo Health"
+
+          report_gate() {
+            local gate="$1" result="$2" details="$3"
+            if [ "$result" = "failure" ]; then
+              "$REPORTER" --gate "$gate" --details "$details" --workflow "$WF" --severity error
+            fi
+          }
+
+          report_gate "Scripts Governance" \
+            "${{ needs.scripts_governance.result }}" \
+            "Scripts directory policy violations detected. Review required and allowed directories."
+
+          report_gate "Repository Health" \
+            "${{ needs.repo_health.result }}" \
+            "Repository health checks failed — missing required artifacts, disallowed files, or content warnings. Check the CI run summary."
+=======
+# ============================================================================
+# Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+#
+# This file is part of a Moko Consulting project.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: mokocli.Validation
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/mokocli
+# PATH: /templates/workflows/joomla/repo_health.yml.template
+# VERSION: 09.23.00
+# BRIEF: Enforces repository guardrails by validating scripts governance, tooling availability, and core repository health artifacts.
+# ============================================================================
+
+name: "Generic: Repo Health"
+
+defaults:
+  run:
+    shell: bash
+
+on:
+  workflow_dispatch:
+    inputs:
+      profile:
+        description: 'Validation profile: all, scripts, or repo'
+        required: true
+        default: all
+        type: choice
+        options:
+          - all
+          - scripts
+          - repo
+  pull_request:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+env:
+  # Scripts governance policy
+  SCRIPTS_REQUIRED_DIRS:
+  SCRIPTS_ALLOWED_DIRS: scripts,scripts/fix,scripts/lib,scripts/release,scripts/run,scripts/validate
+
+  # Repo health policy
+  REPO_REQUIRED_ARTIFACTS: README.md,LICENSE,CHANGELOG.md,CONTRIBUTING.md,CODE_OF_CONDUCT.md,.mokogitea/workflows/
+  REPO_OPTIONAL_FILES: SECURITY.md,GOVERNANCE.md,.editorconfig,.gitattributes,.gitignore,README.md,docs/
+  REPO_DISALLOWED_DIRS:
+  REPO_DISALLOWED_FILES: TODO.md,todo.md
+
+  # Extended checks toggles
+  EXTENDED_CHECKS: "true"
+
+  # File / directory variables
+  DOCS_INDEX: docs/docs-index.md
+  SCRIPT_DIR: scripts
+  WORKFLOWS_DIR: .mokogitea/workflows
+  SHELLCHECK_PATTERN: '*.sh'
+  SPDX_FILE_GLOBS: '*.sh,*.php,*.js,*.ts,*.css,*.xml,*.yml,*.yaml'
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+jobs:
+  access_check:
+    name: Access control
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    permissions:
+      contents: read
+
+    outputs:
+      allowed: ${{ steps.perm.outputs.allowed }}
+      permission: ${{ steps.perm.outputs.permission }}
+
+    steps:
+      - name: Check actor permission (admin only)
+        id: perm
+        env:
+          TOKEN: ${{ secrets.MOKOGITEA_TOKEN || secrets.MOKOGITEA_TOKEN || github.token }}
+          REPO: ${{ github.repository }}
+          ACTOR: ${{ github.actor }}
+        run: |
+          set -euo pipefail
+          ALLOWED=false
+          PERMISSION=unknown
+          METHOD=""
+
+          # Hardcoded authorized users — always allowed
+          case "$ACTOR" in
+            jmiller|gitea-actions[bot])
+              ALLOWED=true
+              PERMISSION=admin
+              METHOD="hardcoded allowlist"
+              ;;
+            *)
+              # Detect platform and check permissions via API
+              API_BASE="${GITHUB_API_URL:-${GITEA_API_URL:-https://api.github.com}}"
+              RESP=$(curl -sf -H "Authorization: token ${TOKEN}" \
+                "${API_BASE}/repos/${REPO}/collaborators/${ACTOR}/permission" 2>/dev/null || echo '{}')
+              PERMISSION=$(echo "$RESP" | grep -oP '"permission"\s*:\s*"\K[^"]+' || echo "unknown")
+              if [ "$PERMISSION" = "admin" ] || [ "$PERMISSION" = "maintain" ] || [ "$PERMISSION" = "owner" ]; then
+                ALLOWED=true
+              fi
+              METHOD="collaborator API"
+              ;;
+          esac
+
+          echo "permission=${PERMISSION}" >> "$GITHUB_OUTPUT"
+          echo "allowed=${ALLOWED}" >> "$GITHUB_OUTPUT"
+
+          {
+            echo "## Access Authorization"
+            echo ""
+            echo "| Field | Value |"
+            echo "|-------|-------|"
+            echo "| **Actor** | \`${ACTOR}\` |"
+            echo "| **Repository** | \`${REPO}\` |"
+            echo "| **Permission** | \`${PERMISSION}\` |"
+            echo "| **Method** | ${METHOD} |"
+            echo "| **Authorized** | ${ALLOWED} |"
+            echo ""
+            if [ "$ALLOWED" = "true" ]; then
+              echo "${ACTOR} authorized (${METHOD})"
+            else
+              echo "${ACTOR} is NOT authorized. Requires admin or maintain role."
+            fi
+          } >> "${GITHUB_STEP_SUMMARY}"
+
+      - name: Deny execution when not permitted
+        if: ${{ steps.perm.outputs.allowed != 'true' }}
+        run: |
+          set -euo pipefail
+          printf '%s\n' 'ERROR: Access denied. Admin permission required.' >> "${GITHUB_STEP_SUMMARY}"
+          exit 1
+
+  scripts_governance:
+    name: Scripts governance
+    needs: access_check
+    if: ${{ needs.access_check.outputs.allowed == 'true' }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          fetch-depth: 0
+
+      - name: Scripts folder checks
+        env:
+          PROFILE_RAW: ${{ github.event.inputs.profile }}
+        run: |
+          set -euo pipefail
+
+          profile="${PROFILE_RAW:-all}"
+          case "${profile}" in
+            all|scripts|repo) ;;
+            *)
+              printf '%s\n' "ERROR: Unknown profile: ${profile}" >> "${GITHUB_STEP_SUMMARY}"
+              exit 1
+              ;;
+          esac
+
+          if [ "${profile}" = 'repo' ]; then
+            {
+              printf '%s\n' '### Scripts governance'
+              printf '%s\n' "Profile: ${profile}"
+              printf '%s\n' 'Status: SKIPPED'
+              printf '%s\n' 'Reason: profile excludes scripts governance'
+              printf '\n'
+            } >> "${GITHUB_STEP_SUMMARY}"
+            exit 0
+          fi
+
+          if [ ! -d "${SCRIPT_DIR}" ]; then
+            {
+              printf '%s\n' '### Scripts governance'
+              printf '%s\n' 'Status: OK (advisory)'
+              printf '%s\n' 'scripts/ directory not present. No scripts governance enforced.'
+              printf '\n'
+            } >> "${GITHUB_STEP_SUMMARY}"
+            exit 0
+          fi
+
+          if [ -n "${SCRIPTS_REQUIRED_DIRS:-}" ]; then IFS=',' read -r -a required_dirs <<< "${SCRIPTS_REQUIRED_DIRS}"; else required_dirs=(); fi
+          IFS=',' read -r -a allowed_dirs <<< "${SCRIPTS_ALLOWED_DIRS}"
+
+          missing_dirs=()
+          unapproved_dirs=()
+
+          for d in "${required_dirs[@]}"; do
+            req="${d%/}"
+            [ ! -d "${req}" ] && missing_dirs+=("${req}/")
+          done
+
+          while IFS= read -r d; do
+            allowed=false
+            for a in "${allowed_dirs[@]}"; do
+              a_norm="${a%/}"
+              [ "${d%/}" = "${a_norm}" ] && allowed=true
+            done
+            [ "${allowed}" = false ] && unapproved_dirs+=("${d%/}/")
+          done < <(find "${SCRIPT_DIR}" -maxdepth 1 -mindepth 1 -type d 2>/dev/null | sed 's#^\./##')
+
+          {
+            printf '%s\n' '### Scripts governance'
+            printf '%s\n' "Profile: ${profile}"
+            printf '%s\n' '| Area | Status | Notes |'
+            printf '%s\n' '|---|---|---|'
+
+            if [ "${#missing_dirs[@]}" -gt 0 ]; then
+              printf '%s\n' '| Required directories | Warning | Missing required subfolders |'
+            else
+              printf '%s\n' '| Required directories | OK | All required subfolders present |'
+            fi
+
+            if [ "${#unapproved_dirs[@]}" -gt 0 ]; then
+              printf '%s\n' '| Directory policy | Warning | Unapproved directories detected |'
+            else
+              printf '%s\n' '| Directory policy | OK | No unapproved directories |'
+            fi
+
+            printf '%s\n' '| Enforcement mode | Advisory | scripts folder is optional |'
+            printf '\n'
+
+            if [ "${#missing_dirs[@]}" -gt 0 ]; then
+              printf '%s\n' 'Missing required script directories:'
+              for m in "${missing_dirs[@]}"; do printf '%s\n' "- ${m}"; done
+              printf '\n'
+            else
+              printf '%s\n' 'Missing required script directories: none.'
+              printf '\n'
+            fi
+
+            if [ "${#unapproved_dirs[@]}" -gt 0 ]; then
+              printf '%s\n' 'Unapproved script directories detected:'
+              for m in "${unapproved_dirs[@]}"; do printf '%s\n' "- ${m}"; done
+              printf '\n'
+            else
+              printf '%s\n' 'Unapproved script directories detected: none.'
+              printf '\n'
+            fi
+
+            printf '%s\n' 'Scripts governance completed in advisory mode.'
+            printf '\n'
+          } >> "${GITHUB_STEP_SUMMARY}"
+
   repo_health:
     name: Repository health
     needs: access_check
@@ -709,3 +1425,4 @@ jobs:
           report_gate "Repository Health" \
             "${{ needs.repo_health.result }}" \
             "Repository health checks failed — missing required artifacts, disallowed files, or content warnings. Check the CI run summary."
+>>>>>>> main

.mokogitea/workflows/security-audit.yml

@@ -4,10 +4,17 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Security
+<<<<<<< HEAD
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# INGROUP: MokoCLI.Security
-# PATH: /.gitea/workflows/security-audit.yml
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# PATH: /.mokogitea/workflows/security-audit.yml
 # VERSION: 09.23.00
+=======
+# INGROUP: MokoStandards.Security
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
+# PATH: /.gitea/workflows/security-audit.yml
+# VERSION: 01.00.00
+>>>>>>> main
 # BRIEF: Dependency vulnerability scanning for composer and npm packages
 
 name: "Universal: Security Audit"
@@ -80,19 +87,3 @@ jobs:
             -H "Priority: high" \
             -d "Security audit found vulnerabilities. Review dependency updates." \
             "${NTFY_URL}/${NTFY_TOPIC}" || true
-
-
-      - name: Joomla version audit
-        if: always()
-        run: |
-          if [ -f "monitoring/joomla-version-audit.php" ] && [ -n "$JOOMLA_SITES" ]; then
-            echo "$JOOMLA_SITES" > /tmp/sites.json
-            php monitoring/joomla-version-audit.php --sites /tmp/sites.json || true
-            echo "### Joomla Version Audit" >> $GITHUB_STEP_SUMMARY
-            rm -f /tmp/sites.json
-          else
-            echo "Joomla audit skipped (no script or JOOMLA_SITES_JSON not configured)"
-          fi
-        env:
-          JOOMLA_SITES: ${{ vars.JOOMLA_SITES_JSON }}
-

.mokogitea/workflows/sync-feature-versions.yml

@@ -0,0 +1,103 @@
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: mokocli.Automation
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# PATH: /.mokogitea/workflows/sync-feature-versions.yml
+# VERSION: 01.00.00
+# BRIEF: Merge dev into open feature branches after version bumps
+
+name: "Universal: Sync Feature Branch Versions"
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+env:
+  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+
+jobs:
+  sync:
+    name: Sync feature branches with dev
+    runs-on: ubuntu-latest
+    if: >-
+      github.event_name == 'workflow_dispatch' ||
+      contains(github.event.head_commit.message, 'chore(version)')
+
+    steps:
+      - name: Checkout dev
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: dev
+          token: ${{ secrets.MOKOGITEA_TOKEN }}
+
+      - name: Configure git
+        run: |
+          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.name "gitea-actions[bot]"
+          git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
+
+      - name: Merge dev into feature branches
+        run: |
+          echo "=== Syncing feature branches with dev ==="
+
+          # Fetch all remote branches
+          git fetch origin
+
+          # Find feature branches (feature/*, fix/*, patch/*, hotfix/*, bugfix/*, chore/*)
+          BRANCHES=$(git branch -r --list 'origin/feature/*' 'origin/fix/*' 'origin/patch/*' 'origin/hotfix/*' 'origin/bugfix/*' 'origin/chore/*' | sed 's|origin/||; s/^[[:space:]]*//')
+
+          if [ -z "$BRANCHES" ]; then
+            echo "No feature branches found — nothing to sync"
+            exit 0
+          fi
+
+          SYNCED=0
+          SKIPPED=0
+          FAILED=0
+
+          for BRANCH in $BRANCHES; do
+            echo ""
+            echo "--- ${BRANCH} ---"
+
+            # Skip branches that are already up to date with dev
+            if git merge-base --is-ancestor dev "origin/${BRANCH}" 2>/dev/null; then
+              echo "Already up to date"
+              SKIPPED=$((SKIPPED + 1))
+              continue
+            fi
+
+            # Try to merge dev into the branch
+            git checkout "origin/${BRANCH}" -B "$BRANCH" 2>/dev/null
+            if git merge dev --no-edit -m "chore: merge dev into ${BRANCH} (version sync) [skip ci]" 2>/dev/null; then
+              git push origin "$BRANCH" 2>/dev/null
+              echo "Synced successfully"
+              SYNCED=$((SYNCED + 1))
+            else
+              git merge --abort 2>/dev/null || true
+              echo "Merge conflict — skipping (manual rebase needed)"
+              FAILED=$((FAILED + 1))
+            fi
+          done
+
+          # Return to dev
+          git checkout dev 2>/dev/null || true
+
+          echo ""
+          echo "=== Summary ==="
+          echo "Synced: ${SYNCED}"
+          echo "Already current: ${SKIPPED}"
+          echo "Conflicts (skipped): ${FAILED}"
+
+          if [ "$FAILED" -gt 0 ]; then
+            echo "::warning::${FAILED} branch(es) had merge conflicts and need manual rebase"
+          fi

.mokogitea/workflows/update-server.yml

@@ -1,302 +0,0 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Universal
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
-# PATH: /templates/workflows/update-server.yml
-# VERSION: 09.23.00
-# BRIEF: Pre-release build + update server XML for dev/alpha/beta/rc branches
-#
-# Thin wrapper around moko-platform CLI tools.
-# Builds packages, updates updates.xml, and optionally deploys via SFTP.
-#
-# Joomla filters update entries by the user's "Minimum Stability" setting.
-
-name: "Update Server"
-
-on:
-  push:
-    branches:
-      - 'dev'
-      - 'dev/**'
-      - 'alpha/**'
-      - 'beta/**'
-      - 'rc/**'
-    paths:
-      - 'src/**'
-      - 'htdocs/**'
-  pull_request:
-    types: [closed]
-    branches:
-      - 'dev'
-      - 'dev/**'
-      - 'alpha/**'
-      - 'beta/**'
-      - 'rc/**'
-    paths:
-      - 'src/**'
-      - 'htdocs/**'
-  workflow_dispatch:
-    inputs:
-      stability:
-        description: 'Stability tag'
-        required: true
-        default: 'development'
-        type: choice
-        options:
-          - development
-          - alpha
-          - beta
-          - rc
-          - stable
-
-env:
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
-  GITEA_ORG: ${{ vars.GITEA_ORG || github.repository_owner }}
-  GITEA_REPO: ${{ vars.GITEA_REPO || github.event.repository.name }}
-
-permissions:
-  contents: write
-
-jobs:
-  update-xml:
-    name: Update Server
-    runs-on: release
-    if: >-
-      github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch' || github.event_name == 'push'
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.MOKOGITEA_TOKEN }}
-          fetch-depth: 0
-
-      - name: Setup moko-platform tools
-        env:
-          MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
-          MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
-          COMPOSER_AUTH: '{"http-basic":{"git.mokoconsulting.tech":{"username":"token","password":"${{ secrets.MOKOGITEA_TOKEN }}"}}}'
-        run: |
-          if ! command -v composer &> /dev/null; then
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
-          fi
-          # Always fetch latest CLI tools — never use stale cache from previous runs
-          rm -rf /tmp/moko-platform
-          git clone --depth 1 --branch main --quiet \
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
-            /tmp/moko-platform 2>/dev/null || true
-          if [ -d "/tmp/moko-platform" ] && [ -f "/tmp/moko-platform/composer.json" ]; then
-            cd /tmp/moko-platform && composer install --no-dev --no-interaction --quiet 2>/dev/null || true
-          fi
-          echo "MOKO_CLI=/tmp/moko-platform/cli" >> "$GITHUB_ENV"
-
-      - name: Detect platform
-        id: platform
-        run: php ${MOKO_CLI}/manifest_read.php --path . --github-output
-
-      - name: Resolve stability and bump version
-        id: meta
-        run: |
-          BRANCH="${{ github.ref_name }}"
-
-          # Configure git for bot pushes
-          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "gitea-actions[bot]"
-          git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
-
-          # Determine stability from branch or manual input
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            STABILITY="${{ inputs.stability }}"
-          elif [[ "$BRANCH" == rc/* ]]; then
-            STABILITY="rc"
-          elif [[ "$BRANCH" == beta/* ]]; then
-            STABILITY="beta"
-          elif [[ "$BRANCH" == alpha/* ]]; then
-            STABILITY="alpha"
-          else
-            STABILITY="development"
-          fi
-
-          # Gitea release tag per stability
-          case "$STABILITY" in
-            development) TAG="development" ;;
-            alpha)       TAG="alpha" ;;
-            beta)        TAG="beta" ;;
-            rc)          TAG="release-candidate" ;;
-            *)           TAG="stable" ;;
-          esac
-
-          # Bump patch, set platform suffix, fix consistency — version_bump preserves suffix
-          php ${MOKO_CLI}/version_set_platform.php \
-            --path . --version "$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null || echo '00.00.01')" \
-            --branch "$BRANCH" --stability "$STABILITY" 2>/dev/null || true
-          php ${MOKO_CLI}/version_bump.php --path . 2>/dev/null || true
-          php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true
-
-          # Read final version (includes suffix, e.g. 01.02.15-dev)
-          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null || echo "00.00.01")
-
-          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
-          echo "stability=${STABILITY}" >> "$GITHUB_OUTPUT"
-          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
-
-          # Commit version bump if changed
-          git add -A
-          git diff --cached --quiet || {
-            git commit -m "chore(version): auto-bump ${VERSION} [skip ci]" \
-              --author="gitea-actions[bot] <gitea-actions[bot]@mokoconsulting.tech>"
-            git push
-          }
-
-      - name: Create release and upload package
-        id: package
-        run: |
-          VERSION="${{ steps.meta.outputs.version }}"
-          TAG="${{ steps.meta.outputs.tag }}"
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-
-          # Create or update Gitea release
-          php ${MOKO_CLI}/release_create.php \
-            --path . --version "$VERSION" --tag "$TAG" \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
-            --repo "${GITEA_REPO}" --branch "${{ github.ref_name }}" --prerelease
-
-          # Build package and upload
-          php ${MOKO_CLI}/release_package.php \
-            --path . --version "$VERSION" --tag "$TAG" \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
-            --repo "${GITEA_REPO}" --output /tmp || true
-
-      - name: Update updates.xml
-        if: steps.platform.outputs.platform == 'joomla'
-        run: |
-          VERSION="${{ steps.meta.outputs.version }}"
-          STABILITY="${{ steps.meta.outputs.stability }}"
-          SHA256="${{ steps.package.outputs.sha256_zip }}"
-
-          if [ ! -f "updates.xml" ]; then
-            echo "No updates.xml — skipping"
-            exit 0
-          fi
-
-          SHA_FLAG=""
-          [ -n "$SHA256" ] && SHA_FLAG="--sha ${SHA256}"
-
-          php ${MOKO_CLI}/updates_xml_build.php \
-            --path . --version "${VERSION}" --stability "${STABILITY}" \
-            --gitea-url "${GITEA_URL}" --org "${GITEA_ORG}" --repo "${GITEA_REPO}" \
-            ${SHA_FLAG}
-
-          # Commit and push updates.xml
-          git add updates.xml
-          git diff --cached --quiet || {
-            git commit -m "chore: update ${STABILITY} channel ${VERSION} [skip ci]"
-            git push
-          }
-
-      - name: Sync updates.xml to main
-        if: github.ref_name != 'main' && steps.platform.outputs.platform == 'joomla'
-        run: |
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          GITEA_TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
-
-          FILE_SHA=$(curl -sf -H "Authorization: token ${GITEA_TOKEN}" \
-            "${API_BASE}/contents/updates.xml?ref=main" | python3 -c "import sys,json; print(json.load(sys.stdin).get('sha',''))" 2>/dev/null || true)
-
-          if [ -n "$FILE_SHA" ] && [ -f "updates.xml" ]; then
-            python3 -c "
-          import base64, json, urllib.request, sys
-          with open('updates.xml', 'rb') as f:
-              content = base64.b64encode(f.read()).decode()
-          payload = json.dumps({
-              'content': content,
-              'sha': '${FILE_SHA}',
-              'message': 'chore: sync updates.xml from ${{ steps.meta.outputs.stability }} [skip ci]',
-              'branch': 'main'
-          }).encode()
-          req = urllib.request.Request(
-              '${API_BASE}/contents/updates.xml',
-              data=payload, method='PUT',
-              headers={
-                  'Authorization': 'token ${GITEA_TOKEN}',
-                  'Content-Type': 'application/json'
-              })
-          try:
-              urllib.request.urlopen(req)
-              print('updates.xml synced to main')
-          except Exception as e:
-              print(f'WARNING: sync to main failed: {e}', file=sys.stderr)
-          "
-          fi
-
-      - name: SFTP deploy to dev server
-        if: contains(github.ref, 'dev/') || github.ref == 'refs/heads/dev'
-        env:
-          DEV_HOST: ${{ vars.DEV_FTP_HOST }}
-          DEV_PATH: ${{ vars.DEV_FTP_PATH }}
-          DEV_SUFFIX: ${{ vars.DEV_FTP_SUFFIX }}
-          DEV_USER: ${{ vars.DEV_FTP_USERNAME }}
-          DEV_PORT: ${{ vars.DEV_FTP_PORT }}
-          DEV_KEY: ${{ secrets.DEV_FTP_KEY }}
-          DEV_PASS: ${{ secrets.DEV_FTP_PASSWORD }}
-        run: |
-          # Permission check: admin or maintain role required
-          ACTOR="${{ github.actor }}"
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-
-          PERMISSION=$(curl -sf -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
-            "${API_BASE}/collaborators/${ACTOR}/permission" 2>/dev/null | \
-            python3 -c "import sys,json; print(json.load(sys.stdin).get('permission','read'))" 2>/dev/null || echo "read")
-          case "$PERMISSION" in
-            admin|maintain|write) ;;
-            *)
-              echo "Deploy denied: ${ACTOR} has '${PERMISSION}' — requires admin, maintain, or write"
-              exit 0
-              ;;
-          esac
-
-          [ -z "$DEV_HOST" ] || [ -z "$DEV_PATH" ] && { echo "DEV FTP not configured — skipping SFTP"; exit 0; }
-
-          SOURCE_DIR="src"
-          [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs"
-          [ ! -d "$SOURCE_DIR" ] && exit 0
-
-          PORT="${DEV_PORT:-22}"
-          REMOTE="${DEV_PATH%/}"
-          [ -n "$DEV_SUFFIX" ] && REMOTE="${REMOTE}/${DEV_SUFFIX#/}"
-
-          printf '{"host":"%s","port":%s,"username":"%s","remotePath":"%s"' \
-            "$DEV_HOST" "$PORT" "$DEV_USER" "$REMOTE" > /tmp/sftp-config.json
-          if [ -n "$DEV_KEY" ]; then
-            echo "$DEV_KEY" > /tmp/deploy_key && chmod 600 /tmp/deploy_key
-            printf ',"privateKeyPath":"/tmp/deploy_key"}' >> /tmp/sftp-config.json
-          else
-            printf ',"password":"%s"}' "$DEV_PASS" >> /tmp/sftp-config.json
-          fi
-
-          PLATFORM=$(php ${MOKO_CLI}/platform_detect.php --path . 2>/dev/null || true)
-          if [ "$PLATFORM" = "waas-component" ] && [ -f "${MOKO_CLI}/../deploy/deploy-joomla.php" ]; then
-            php ${MOKO_CLI}/../deploy/deploy-joomla.php --path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json
-          elif [ -f "${MOKO_CLI}/../deploy/deploy-sftp.php" ]; then
-            php ${MOKO_CLI}/../deploy/deploy-sftp.php --path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json
-          fi
-          rm -f /tmp/deploy_key /tmp/sftp-config.json
-          echo "SFTP deploy to dev complete" >> $GITHUB_STEP_SUMMARY
-
-      - name: Summary
-        if: always()
-        run: |
-          VERSION="${{ steps.meta.outputs.version }}"
-          STABILITY="${{ steps.meta.outputs.stability }}"
-          DISPLAY="${VERSION}"
-          echo "## Update Server" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
-          echo "|-------|-------|" >> $GITHUB_STEP_SUMMARY
-          echo "| Stability | \`${STABILITY}\` |" >> $GITHUB_STEP_SUMMARY
-          echo "| Version | \`${DISPLAY}\` |" >> $GITHUB_STEP_SUMMARY

.mokogitea/workflows/workflow-sync-trigger.yml

@@ -0,0 +1,73 @@
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: mokocli.Universal
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# PATH: /.mokogitea/workflows/workflow-sync-trigger.yml
+# VERSION: 01.01.00
+# BRIEF: Trigger workflow sync to live repos when a PR is merged to main
+
+name: "Universal: Workflow Sync Trigger"
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - main
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+jobs:
+  sync:
+    name: Sync workflows to live repos
+    runs-on: ubuntu-latest
+    if: >-
+      github.event.pull_request.merged == true &&
+      !contains(github.event.pull_request.title, '[skip sync]')
+
+    steps:
+      - name: Determine platform from repo name
+        id: platform
+        run: |
+          REPO="${{ github.event.repository.name }}"
+          case "$REPO" in
+            Template-Joomla)   PLATFORM="joomla" ;;
+            Template-Dolibarr) PLATFORM="dolibarr" ;;
+            Template-Go)       PLATFORM="go" ;;
+            Template-MCP)      PLATFORM="mcp" ;;
+            Template-Generic)  PLATFORM="" ;;
+            *)                 PLATFORM="" ;;
+          esac
+          echo "platform=$PLATFORM" >> "$GITHUB_OUTPUT"
+          echo "Platform: ${PLATFORM:-all}"
+
+      - name: Clone mokocli
+        env:
+          MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+        run: |
+          GITEA_URL="${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}"
+          git clone --depth 1 "${GITEA_URL}/MokoConsulting/mokocli.git" /tmp/mokocli
+
+      - name: Install dependencies
+        run: |
+          cd /tmp/mokocli
+          composer install --no-dev --no-interaction --quiet 2>/dev/null || true
+
+      - name: Run workflow sync
+        env:
+          MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+        run: |
+          ARGS="--token ${MOKOGITEA_TOKEN}"
+          ARGS="${ARGS} --org ${{ vars.GITEA_ORG || github.repository_owner }}"
+          ARGS="${ARGS} --phase repos"
+
+          PLATFORM="${{ steps.platform.outputs.platform }}"
+          if [ -n "$PLATFORM" ]; then
+            ARGS="${ARGS} --platform-filter ${PLATFORM}"
+          fi
+
+          php /tmp/mokocli/cli/workflow_sync.php ${ARGS}

.script-registry.json

@@ -1,7 +1,11 @@
 {
     "metadata": {
         "generated_at": "2026-03-10T19:51:42.238134Z",
-        "repository": "MokoConsulting/moko-platform",
+<<<<<<< HEAD
+        "repository": "MokoConsulting/mokocli",
+=======
+        "repository": "MokoConsulting/mokoplatform",
+>>>>>>> main
         "version": "1.0.0"
     },
     "scripts": [

CHANGELOG.md

@@ -2,37 +2,48 @@
 Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 SPDX-License-Identifier: GPL-3.0-or-later
 FILE INFORMATION
+<<<<<<< HEAD
 DEFGROUP: MokoStandards.Root
 INGROUP: MokoStandards
-REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+DEFGROUP: MokoCli.Root
+INGROUP: MokoCli
+REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
 PATH: /CHANGELOG.md
 BRIEF: Release changelog
 -->
 
 # Changelog
-
 ## [Unreleased]
 
-## [09.23] --- 2026-05-31
+## [09.32.00] --- 2026-06-21
 
-## [09.22] --- 2026-05-31
+## [09.32.00] --- 2026-06-21
+
+## [09.31.00] --- 2026-06-21
+
+## [09.31.00] --- 2026-06-21
+
+## [09.30.00] --- 2026-06-21
+
+## [09.30.00] --- 2026-06-21
+
+### Added
+- `security:advisories` command — cross-repo security advisory aggregator (#150)
+  - Scans org repos for known CVEs via `composer audit`
+  - Aggregates results into a single report with severity breakdown
+  - Auto-creates tracking issues for critical/high vulnerabilities (`--create-issues`)
+  - Checkpoint-based resumability with `--resume`
+  - Export to JSON/CSV with `--export`
 
 ### Changed
-- **refactor(cli):** migrate 64 legacy scripts to CliFramework (#235) — all tools in cli/, automation/, maintenance/, deploy/, release/ now extend CliFramework with free --help, --verbose, --quiet, --dry-run, --json, banners, and coloured logging
+- `manifest:read` rewritten to use Gitea manifest API as primary source (#283)
-
+  - Falls back to auto-detection from source tree (Joomla, Dolibarr, generic)
-### Fixed
+  - No longer requires `.mokogitea/manifest.xml` file
-- fix: auto-detect org/repo in updates_xml_build from manifest and git remote
+  - Backward-compatible field aliases for existing CI consumers
-- fix: restore hyphen in version suffixes
+- Renamed `MokoStandards` namespace → `MokoCli` across all files
-- fix: release names use standardized format
+- Renamed `MokoEnterprise` namespace → `MokoCli` across all files
-- fix: remove lesser stream copies, each stream updates independently
+- Renamed `MokoStandardsParser` class → `ManifestParser`
-- fix: sort updates.xml entries dev first, stable last
+- Fixed `composer.json` autoload paths: `src/` → `source/`
-
-## [09.21] --- 2026-05-30
-
-## [09.20] --- 2026-05-30
-
-## [09.19] --- 2026-05-30
-
-## [09.18] --- 2026-05-30
-
-## [09.17] --- 2026-05-30

CLAUDE.md

@@ -1,102 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code when working with this repository.
-
-## Project Overview
-
-**moko-platform** — Enterprise automation, validation, sync, and governance engine for all Moko Consulting repositories
-
-| Field | Value |
-|---|---|
-| **Language** | PHP 8.1+ |
-| **Default branch** | main |
-| **License** | GPL-3.0-or-later |
-| **Version** | 09.01.00 |
-| **Wiki** | [moko-platform Wiki](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki) |
-
-## Common Commands
-
-```bash
-composer install                         # Install PHP dependencies
-php bin/moko health --path .             # Run repo health check
-php bin/moko check:syntax --path .       # PHP syntax check
-php bin/moko drift --org MokoConsulting  # Scan for standards drift
-php bin/moko dashboard --token $TOKEN -o dashboard.html  # Generate client dashboard
-
-# Code quality
-php vendor/bin/phpcs --standard=phpcs.xml -n lib/ validate/ automation/ cli/
-php vendor/bin/phpcbf --standard=phpcs.xml lib/ validate/ automation/ cli/
-php vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=512M
-
-# Run all checks
-composer check
-```
-
-## Architecture
-
-### Directory Layout
-
-| Directory | Purpose |
-|-----------|---------|
-| `cli/` | 32 standalone CLI tools (version, release, build, repo management) |
-| `validate/` | 20 validation scripts (syntax, structure, manifests, drift) |
-| `automation/` | 7 bulk operations (sync, push files, templates, cleanup) |
-| `lib/Enterprise/` | Core library — CliFramework, ApiClient, adapters, validators |
-| `lib/Enterprise/Plugins/` | 11 platform plugins (Joomla, Dolibarr, Node.js, Python, etc.) |
-| `deploy/` | SFTP deployment scripts (Joomla, Dolibarr, health checks) |
-| `templates/` | Universal templates, configs, governance schema |
-| `.mokogitea/workflows/` | CI/CD workflows (Gitea Actions) |
-| `bin/moko` | Unified CLI dispatcher — runs any tool via `php bin/moko <command>` |
-
-### CLI Framework
-
-All CLI tools extend `MokoEnterprise\CliFramework` (defined in `lib/Enterprise/CliFramework.php`).
-
-Pattern for new tools:
-```php
-class MyTool extends CliFramework {
-    protected function configure(): void {
-        $this->setDescription('What this tool does');
-        $this->addArgument('--name', 'Description', 'default');
-    }
-    protected function run(): int {
-        $name = $this->getArgument('--name');
-        // ... business logic ...
-        return 0;
-    }
-}
-$app = new MyTool();
-exit($app->execute());
-```
-
-Built-in flags: `--help`, `--verbose`, `--quiet`, `--dry-run`
-
-### Platform Adapters
-
-Git operations are abstracted via `GitPlatformAdapter` interface:
-- `MokoGiteaAdapter` — for git.mokoconsulting.tech (primary)
-- `GitHubAdapter` — for github.com mirrors
-
-### Plugin System
-
-Platform-specific logic lives in `lib/Enterprise/Plugins/`. Each plugin implements `ProjectPluginInterface` with methods for health checks, validation, build commands, and config schemas.
-
-## Code Quality
-
-| Tool | Level | Config |
-|------|-------|--------|
-| PHPCS | PSR-12 (errors only) | `phpcs.xml` |
-| PHPStan | Level 2 | `phpstan.neon` |
-
-PHPStan runs with `--memory-limit=512M` due to large codebase. CI enforces PHPCS errors; PHPStan is advisory (`continue-on-error`).
-
-## Rules
-
-- **Workflow directory**: `.mokogitea/` (not `.gitea/` or `.github/`)
-- **Never commit** `.claude/`, `.mcp.json`, `TODO.md`, or `*.min.css`/`*.min.js`
-- **Attribution**: use `Authored-by: Moko Consulting` in commits
-- **Branch strategy**: develop on `dev`, merge to `main` for release
-- **Minification**: handled at build time (CI) and runtime (MokoMinifyHelper for Joomla templates)
-- **Wiki**: documentation lives in the Gitea wiki, not in `docs/` files
-- **New CLI tools**: extend `CliFramework`, not `CLIApp` (legacy)
-- **After adding a CLI tool**: register it in `bin/moko` COMMAND_MAP

PLUGIN_SCRIPTS.md

@@ -2,16 +2,26 @@
 Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 SPDX-License-Identifier: GPL-3.0-or-later
 FILE INFORMATION
+<<<<<<< HEAD
+DEFGROUP: MokoCLI.Root
+INGROUP: MokoCLI
+REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
 DEFGROUP: MokoPlatform.Root
 INGROUP: MokoPlatform
-REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
 PATH: /PLUGIN_SCRIPTS.md
 BRIEF: Plugin system CLI documentation
 -->
 
 # Plugin System CLI Scripts
 
-Command-line scripts for validating, health checking, and managing projects using the moko-platform plugin system.
+<<<<<<< HEAD
+Command-line scripts for validating, health checking, and managing projects using the MokoCLI plugin system.
+=======
+Command-line scripts for validating, health checking, and managing projects using the mokoplatform plugin system.
+>>>>>>> main
 
 ## Available Scripts
 

README.md

@@ -2,22 +2,38 @@
 Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 SPDX-License-Identifier: GPL-3.0-or-later
 FILE INFORMATION
-DEFGROUP: MokoPlatform.Root
+<<<<<<< HEAD
-INGROUP: MokoPlatform
+DEFGROUP: MokoCLI.Root
-REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+INGROUP: MokoCLI
+REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 PATH: /README.md
-VERSION: 09.23.00
+VERSION: 09.25.05
 BRIEF: Project overview and documentation
 -->
 
-# moko-platform Enterprise API
+# MokoCLI Enterprise API
 
 ![Version](https://img.shields.io/badge/version-09.01.00-blue) ![PHP](https://img.shields.io/badge/PHP-8.1%2B-777BB4) ![License](https://img.shields.io/badge/license-GPL--3.0--or--later-green)
 
-PHP implementation of moko-platform — enterprise standards, automation framework, workflow templates, and bulk sync tooling.
+PHP implementation of MokoCLI — enterprise standards, automation framework, workflow templates, and bulk sync tooling.
+=======
+DEFGROUP: MokoPlatform.Root
+INGROUP: MokoPlatform
+REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+PATH: /README.md
+VERSION: 09.32.00
+BRIEF: Project overview and documentation
+-->
 
-> **Primary platform**: [Gitea — git.mokoconsulting.tech](https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API)
+# mokoplatform Enterprise API
-> **Backup mirror**: [GitHub](https://github.com/MokoConsulting/MokoStandards-API) *(read-only mirror)*
+
+![Version](https://img.shields.io/badge/version-09.01.00-blue) ![PHP](https://img.shields.io/badge/PHP-8.1%2B-777BB4) ![License](https://img.shields.io/badge/license-GPL--3.0--or--later-green)
+
+PHP implementation of mokoplatform — enterprise standards, automation framework, workflow templates, and bulk sync tooling.
+>>>>>>> main
+
+> **Primary platform**: [Gitea — git.mokoconsulting.tech](https://git.mokoconsulting.tech/MokoConsulting/MokoCli-API)
+> **Backup mirror**: [GitHub](https://github.com/MokoConsulting/MokoCli-API) *(read-only mirror)*
 
 ## What Lives Here
 

analysis/index.md

@@ -2,9 +2,15 @@
 Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 SPDX-License-Identifier: GPL-3.0-or-later
 FILE INFORMATION
+<<<<<<< HEAD
+DEFGROUP: MokoCLI.Index
+INGROUP: MokoCLI.Analysis
+REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
 DEFGROUP: MokoPlatform.Index
 INGROUP: MokoPlatform.Analysis
-REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
 PATH: /analysis/index.md
 BRIEF: Analysis directory index
 -->

automation/bulk_joomla_template.php

@@ -9,9 +9,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
+<<<<<<< HEAD
+ * DEFGROUP: MokoCLI.Automation
+ * INGROUP: MokoCLI.Scripts
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
  * DEFGROUP: MokoPlatform.Automation
  * INGROUP: MokoPlatform.Scripts
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /automation/bulk_joomla_template.php
  * BRIEF: Bulk scaffold and sync Joomla template repositories
  *
@@ -28,7 +34,7 @@ declare(strict_types=1);
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\{
+use MokoCli\{
     AuditLogger,
     CliFramework,
     Config,
@@ -42,7 +48,11 @@ use MokoEnterprise\{
  *
  * Provides three operations for Joomla template projects:
  *   --scaffold: Create a new template repository with the full directory structure
- *   --sync:    Push moko-platform files to existing template repositories
+<<<<<<< HEAD
+ *   --sync:    Push MokoCLI files to existing template repositories
+=======
+ *   --sync:    Push mokoplatform files to existing template repositories
+>>>>>>> main
  *   --list:    List all repositories tagged as joomla-template
  *
  * Works with both GitHub and Gitea via the PlatformAdapterFactory.
@@ -318,7 +328,11 @@ class BulkJoomlaTemplate extends CliFramework
                             $name,
                             $path,
                             $content,
-                            "chore: update {$path} from moko-platform",
+<<<<<<< HEAD
+                            "chore: update {$path} from MokoCLI",
+=======
+                            "chore: update {$path} from mokoplatform",
+>>>>>>> main
                             $existingSha,
                             $branch
                         );

automation/bulk_sync.php

@@ -9,9 +9,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
+<<<<<<< HEAD
+ * DEFGROUP: MokoCLI.Automation
+ * INGROUP: MokoCLI.Scripts
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
  * DEFGROUP: MokoPlatform.Automation
  * INGROUP: MokoPlatform.Scripts
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /automation/bulk_sync.php
  * BRIEF: Enterprise-grade bulk repository synchronization
  */
@@ -21,7 +27,7 @@ declare(strict_types=1);
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\{
+use MokoCli\{
     ApiClient,
     AuditLogger,
     CheckpointManager,
@@ -42,7 +48,11 @@ use MokoEnterprise\{
 /**
  * Bulk Repository Synchronization Tool
  *
- * Synchronizes moko-platform files across multiple repositories using
+<<<<<<< HEAD
+ * Synchronizes MokoCLI files across multiple repositories using
+=======
+ * Synchronizes mokoplatform files across multiple repositories using
+>>>>>>> main
  * the Enterprise library for robust, audited operations.
  */
 class BulkSync extends CliFramework
@@ -95,7 +105,11 @@ class BulkSync extends CliFramework
      */
     protected function run(): int
     {
-        $this->log("🚀 moko-platform Bulk Synchronization v" . self::VERSION, 'INFO');
+<<<<<<< HEAD
+        $this->log("🚀 MokoCLI Bulk Synchronization v" . self::VERSION, 'INFO');
+=======
+        $this->log("🚀 mokoplatform Bulk Synchronization v" . self::VERSION, 'INFO');
+>>>>>>> main
 
         // Initialize enterprise components
         if (!$this->initializeComponents()) {
@@ -180,7 +194,11 @@ class BulkSync extends CliFramework
             $results['health'] = $this->runHealthChecksAll($org, $repositories);
         }
 
-        // Create/update tracking issue in moko-platform
+<<<<<<< HEAD
+        // Create/update tracking issue in MokoCLI
+=======
+        // Create/update tracking issue in mokoplatform
+>>>>>>> main
         $this->createSyncIssue($org, $results);
 
         // Create/update a failure issue when any repos failed
@@ -244,7 +262,11 @@ class BulkSync extends CliFramework
      * Filter repositories based on include/exclude lists
      */
     /** Repositories that are permanently excluded from bulk sync. */
-    private const ALWAYS_EXCLUDE = ['moko-platform', '.github-private'];
+<<<<<<< HEAD
+    private const ALWAYS_EXCLUDE = ['MokoCLI', '.github-private'];
+=======
+    private const ALWAYS_EXCLUDE = ['mokoplatform', '.github-private'];
+>>>>>>> main
 
     private function filterRepositories(array $repositories, array $include, array $exclude): array
     {
@@ -426,7 +448,11 @@ class BulkSync extends CliFramework
                 $this->log("", 'ERROR');
                 $this->log("Required Implementation:", 'ERROR');
                 $this->log("  1. Clone/fetch target repository", 'ERROR');
-                $this->log("  2. Apply file updates based on moko-platform configuration", 'ERROR');
+<<<<<<< HEAD
+                $this->log("  2. Apply file updates based on MokoCLI configuration", 'ERROR');
+=======
+                $this->log("  2. Apply file updates based on mokoplatform configuration", 'ERROR');
+>>>>>>> main
                 $this->log("  3. Create pull request with changes", 'ERROR');
                 $this->log("  4. Handle merge conflicts and validation", 'ERROR');
                 $this->log("", 'ERROR');
@@ -837,7 +863,11 @@ class BulkSync extends CliFramework
     }
 
     /**
-     * Ensure all standard moko-platform labels exist on a target repository.
+<<<<<<< HEAD
+     * Ensure all standard MokoCLI labels exist on a target repository.
+=======
+     * Ensure all standard mokoplatform labels exist on a target repository.
+>>>>>>> main
      *
      * Fetches existing labels first (GET) and only POSTs the ones that are
      * missing. This avoids the 422 "already exists" responses that would
@@ -872,7 +902,11 @@ class BulkSync extends CliFramework
 
             // Workflow / Process
             ['automation',             '8B4513', 'Automated processes or scripts'],
-            ['moko-platform',          'B60205', 'moko-platform compliance'],
+<<<<<<< HEAD
+            ['MokoCLI',          'B60205', 'MokoCLI compliance'],
+=======
+            ['mokoplatform',          'B60205', 'mokoplatform compliance'],
+>>>>>>> main
             ['needs-review',           'FBCA04', 'Awaiting code review'],
             ['work-in-progress',       'D93F0B', 'Work in progress, not ready for merge'],
             ['breaking-change',        'D73A4A', 'Breaking API or functionality change'],
@@ -912,8 +946,13 @@ class BulkSync extends CliFramework
             ['health: poor',           'FF6B6B', 'Health score below 50'],
 
             // Sync / Automation (used by bulk_sync, scan_drift, check_repo_health)
-            ['standards-update',       'B60205', 'moko-platform sync update'],
+<<<<<<< HEAD
-            ['standards-drift',        'FBCA04', 'Repository drifted from moko-platform'],
+            ['standards-update',       'B60205', 'MokoCLI sync update'],
+            ['standards-drift',        'FBCA04', 'Repository drifted from MokoCLI'],
+=======
+            ['standards-update',       'B60205', 'mokoplatform sync update'],
+            ['standards-drift',        'FBCA04', 'Repository drifted from mokoplatform'],
+>>>>>>> main
             ['sync-report',            '0075CA', 'Bulk sync run report'],
             ['sync-failure',           'D73A4A', 'Bulk sync failure requiring attention'],
             ['push-failure',           'D73A4A', 'File push failure requiring attention'],
@@ -925,10 +964,17 @@ class BulkSync extends CliFramework
             ['type: version',          '0E8A16', 'Version-related change'],
         ];
 
-        // Quick check: if the repo already has the 'moko-platform' label, it was
+<<<<<<< HEAD
+        // Quick check: if the repo already has the 'MokoCLI' label, it was
         // provisioned previously — skip the expensive full label provisioning.
         try {
-            $probe = $this->api->get("/repos/{$org}/{$repo}/labels/moko-platform");
+            $probe = $this->api->get("/repos/{$org}/{$repo}/labels/MokoCLI");
+=======
+        // Quick check: if the repo already has the 'mokoplatform' label, it was
+        // provisioned previously — skip the expensive full label provisioning.
+        try {
+            $probe = $this->api->get("/repos/{$org}/{$repo}/labels/mokoplatform");
+>>>>>>> main
             if (!empty($probe['name'])) {
                 return; // already provisioned
             }
@@ -1024,7 +1070,11 @@ class BulkSync extends CliFramework
      */
     private function updateOpenBranches(string $org, string $repo): void
     {
-        $syncBranchPrefix = 'chore/sync-moko-platform-';
+<<<<<<< HEAD
+        $syncBranchPrefix = 'chore/sync-MokoCLI-';
+=======
+        $syncBranchPrefix = 'chore/sync-mokoplatform-';
+>>>>>>> main
 
         try {
             $defaultBranch = 'main';
@@ -1055,7 +1105,11 @@ class BulkSync extends CliFramework
                     $this->api->post("/repos/{$org}/{$repo}/merges", [
                         'base'           => $branch,
                         'head'           => $defaultBranch,
-                        'commit_message' => "chore: merge {$defaultBranch} into {$branch} (moko-platform sync)",
+<<<<<<< HEAD
+                        'commit_message' => "chore: merge {$defaultBranch} into {$branch} (MokoCLI sync)",
+=======
+                        'commit_message' => "chore: merge {$defaultBranch} into {$branch} (mokoplatform sync)",
+>>>>>>> main
                     ]);
                     $this->log("  🔀 Merged {$defaultBranch} → {$branch} (PR #{$prNum})", 'INFO');
                 } catch (\Exception $e) {
@@ -1076,7 +1130,11 @@ class BulkSync extends CliFramework
 
     /**
      * Records which sync run touched the repo, the PR number, and the
-     * moko-platform version that was applied — giving each repo a clear audit
+<<<<<<< HEAD
+     * MokoCLI version that was applied — giving each repo a clear audit
+=======
+     * mokoplatform version that was applied — giving each repo a clear audit
+>>>>>>> main
      * trail of what was changed and why.
      */
     /**
@@ -1119,16 +1177,29 @@ class BulkSync extends CliFramework
         $minor       = self::VERSION_MINOR;
         $force       = isset($this->options['force']) ? ' *(--force)*' : '';
         $prLink      = $this->adapter->getPullRequestWebUrl($org, $repo, $prNumber);
-        $source      = $this->adapter->getRepoWebUrl($org, 'moko-platform');
+<<<<<<< HEAD
-        $branchName  = 'chore/sync-moko-platform-v' . $minor;
+        $source      = $this->adapter->getRepoWebUrl($org, 'MokoCLI');
+        $branchName  = 'chore/sync-MokoCLI-v' . $minor;
         $branchLink  = $this->adapter->getBranchWebUrl($org, $repo, $branchName);
 
-        $title = "chore: moko-platform v{$minor} sync tracking";
+        $title = "chore: MokoCLI v{$minor} sync tracking";
 
         $body = <<<MD
-        ## moko-platform Sync Applied
+        ## MokoCLI Sync Applied
 
-        A moko-platform bulk sync run has updated files in this repository.
+        A MokoCLI bulk sync run has updated files in this repository.
+=======
+        $source      = $this->adapter->getRepoWebUrl($org, 'mokoplatform');
+        $branchName  = 'chore/sync-mokoplatform-v' . $minor;
+        $branchLink  = $this->adapter->getBranchWebUrl($org, $repo, $branchName);
+
+        $title = "chore: mokoplatform v{$minor} sync tracking";
+
+        $body = <<<MD
+        ## mokoplatform Sync Applied
+
+        A mokoplatform bulk sync run has updated files in this repository.
+>>>>>>> main
 
         | Field | Value |
         |-------|-------|
@@ -1144,13 +1215,21 @@ class BulkSync extends CliFramework
         Protected files (README, CHANGELOG, GOVERNANCE, etc.) were not overwritten.
 
         ---
-        *Updated automatically by [moko-platform]({$source}) `bulk_sync.php`*
+<<<<<<< HEAD
+        *Updated automatically by [MokoCLI]({$source}) `bulk_sync.php`*
+=======
+        *Updated automatically by [mokoplatform]({$source}) `bulk_sync.php`*
+>>>>>>> main
         MD;
 
         // Dedent heredoc
         $body = preg_replace('/^        /m', '', $body);
 
-        $labelNames = ['standards-update', 'moko-platform', 'type: chore', 'automation'];
+<<<<<<< HEAD
+        $labelNames = ['standards-update', 'MokoCLI', 'type: chore', 'automation'];
+=======
+        $labelNames = ['standards-update', 'mokoplatform', 'type: chore', 'automation'];
+>>>>>>> main
         $labels = $this->resolveLabelIds($org, $repo, $labelNames);
 
         try {
@@ -1213,7 +1292,11 @@ class BulkSync extends CliFramework
     }
 
     /**
-     * Create a tracking issue in moko-platform for this sync run.
+<<<<<<< HEAD
+     * Create a tracking issue in MokoCLI for this sync run.
+=======
+     * Create a tracking issue in mokoplatform for this sync run.
+>>>>>>> main
      */
     private function createSyncIssue(string $org, array $results): void
     {
@@ -1232,7 +1315,11 @@ class BulkSync extends CliFramework
         $issues   = $results['issues'] ?? [];
 
         // Stable title — no timestamp so repeated runs update a single issue
-        $title = "sync: moko-platform v" . self::VERSION_MINOR . " bulk sync report";
+<<<<<<< HEAD
+        $title = "sync: MokoCLI v" . self::VERSION_MINOR . " bulk sync report";
+=======
+        $title = "sync: mokoplatform v" . self::VERSION_MINOR . " bulk sync report";
+>>>>>>> main
 
         $protection = $results['protection'] ?? [];
         $hasProtect = !empty($protection);
@@ -1281,7 +1368,11 @@ class BulkSync extends CliFramework
             : "|---|---|---|---|";
 
         $body = <<<MD
-        ## moko-platform Bulk Sync Report
+<<<<<<< HEAD
+        ## MokoCLI Bulk Sync Report
+=======
+        ## mokoplatform Bulk Sync Report
+>>>>>>> main
 
         **Organisation:** `{$org}`
         **Triggered:** {$now}{$force}
@@ -1301,7 +1392,11 @@ class BulkSync extends CliFramework
 
         try {
             // Search for existing issue by label — any state so we can reopen closed ones
-            $existing = $this->api->get("/repos/{$org}/moko-platform/issues", [
+<<<<<<< HEAD
+            $existing = $this->api->get("/repos/{$org}/MokoCLI/issues", [
+=======
+            $existing = $this->api->get("/repos/{$org}/mokoplatform/issues", [
+>>>>>>> main
                 'labels'   => 'sync-report',
                 'state'    => 'all',
                 'per_page' => 1,
@@ -1309,8 +1404,13 @@ class BulkSync extends CliFramework
                 'direction' => 'desc',
             ]);
 
-            $labelNames = ['sync-report', 'moko-platform', 'type: chore', 'automation'];
+<<<<<<< HEAD
-            $labels = $this->resolveLabelIds($org, 'moko-platform', $labelNames);
+            $labelNames = ['sync-report', 'MokoCLI', 'type: chore', 'automation'];
+            $labels = $this->resolveLabelIds($org, 'MokoCLI', $labelNames);
+=======
+            $labelNames = ['sync-report', 'mokoplatform', 'type: chore', 'automation'];
+            $labels = $this->resolveLabelIds($org, 'mokoplatform', $labelNames);
+>>>>>>> main
             $existing = array_values($existing);
 
             if (!empty($existing) && isset($existing[0]['number'])) {
@@ -1319,22 +1419,38 @@ class BulkSync extends CliFramework
                 if (($existing[0]['state'] ?? 'open') === 'closed') {
                     $patch['state'] = 'open';
                 }
-                $this->api->patch("/repos/{$org}/moko-platform/issues/{$issueNumber}", $patch);
+<<<<<<< HEAD
+                $this->api->patch("/repos/{$org}/MokoCLI/issues/{$issueNumber}", $patch);
                 try {
-                    $this->api->post("/repos/{$org}/moko-platform/issues/{$issueNumber}/labels", ['labels' => $labels]);
+                    $this->api->post("/repos/{$org}/MokoCLI/issues/{$issueNumber}/labels", ['labels' => $labels]);
                 } catch (\Exception $le) {
 /* non-fatal */
                 }
-                $this->log("📋 Sync report issue updated: {$org}/moko-platform#{$issueNumber}", 'INFO');
+                $this->log("📋 Sync report issue updated: {$org}/MokoCLI#{$issueNumber}", 'INFO');
             } else {
-                $issue = $this->api->post("/repos/{$org}/moko-platform/issues", [
+                $issue = $this->api->post("/repos/{$org}/MokoCLI/issues", [
+=======
+                $this->api->patch("/repos/{$org}/mokoplatform/issues/{$issueNumber}", $patch);
+                try {
+                    $this->api->post("/repos/{$org}/mokoplatform/issues/{$issueNumber}/labels", ['labels' => $labels]);
+                } catch (\Exception $le) {
+/* non-fatal */
+                }
+                $this->log("📋 Sync report issue updated: {$org}/mokoplatform#{$issueNumber}", 'INFO');
+            } else {
+                $issue = $this->api->post("/repos/{$org}/mokoplatform/issues", [
+>>>>>>> main
                     'title'     => $title,
                     'body'      => $body,
                     'labels'    => $labels,
                     'assignees' => ['jmiller'],
                 ]);
                 $issueNumber = $issue['number'] ?? '?';
-                $this->log("📋 Sync report issue created: {$org}/moko-platform#{$issueNumber}", 'INFO');
+<<<<<<< HEAD
+                $this->log("📋 Sync report issue created: {$org}/MokoCLI#{$issueNumber}", 'INFO');
+=======
+                $this->log("📋 Sync report issue created: {$org}/mokoplatform#{$issueNumber}", 'INFO');
+>>>>>>> main
             }
         } catch (\Exception $e) {
             $this->log("⚠️  Failed to create/update sync report issue: " . $e->getMessage(), 'WARN');
@@ -1342,7 +1458,11 @@ class BulkSync extends CliFramework
     }
 
     /**
-     * Create or update a failure issue in moko-platform when repos fail to sync.
+<<<<<<< HEAD
+     * Create or update a failure issue in MokoCLI when repos fail to sync.
+=======
+     * Create or update a failure issue in mokoplatform when repos fail to sync.
+>>>>>>> main
      * Uses the 'sync-failure' label so it is distinct from the run-report issue.
      * Reopens a closed issue rather than creating a duplicate.
      */
@@ -1388,7 +1508,11 @@ class BulkSync extends CliFramework
         $body = preg_replace('/^        /m', '', $body);
 
         try {
-            $existing = $this->api->get("/repos/{$org}/moko-platform/issues", [
+<<<<<<< HEAD
+            $existing = $this->api->get("/repos/{$org}/MokoCLI/issues", [
+=======
+            $existing = $this->api->get("/repos/{$org}/mokoplatform/issues", [
+>>>>>>> main
                 'labels'    => 'sync-failure',
                 'state'     => 'all',
                 'per_page'  => 1,
@@ -1403,17 +1527,31 @@ class BulkSync extends CliFramework
                 if (($existing[0]['state'] ?? 'open') === 'closed') {
                     $patch['state'] = 'open';
                 }
-                $this->api->patch("/repos/{$org}/moko-platform/issues/{$num}", $patch);
+<<<<<<< HEAD
-                $this->log("🚨 Failure issue #{$num} updated: {$org}/moko-platform#{$num}", 'WARN');
+                $this->api->patch("/repos/{$org}/MokoCLI/issues/{$num}", $patch);
+                $this->log("🚨 Failure issue #{$num} updated: {$org}/MokoCLI#{$num}", 'WARN');
             } else {
-                $issue = $this->api->post("/repos/{$org}/moko-platform/issues", [
+                $issue = $this->api->post("/repos/{$org}/MokoCLI/issues", [
                     'title'     => $title,
                     'body'      => $body,
-                    'labels'    => $this->resolveLabelIds($org, 'moko-platform', ['sync-failure']),
+                    'labels'    => $this->resolveLabelIds($org, 'MokoCLI', ['sync-failure']),
                     'assignees' => ['jmiller'],
                 ]);
                 $num = $issue['number'] ?? '?';
-                $this->log("🚨 Failure issue created: {$org}/moko-platform#{$num}", 'WARN');
+                $this->log("🚨 Failure issue created: {$org}/MokoCLI#{$num}", 'WARN');
+=======
+                $this->api->patch("/repos/{$org}/mokoplatform/issues/{$num}", $patch);
+                $this->log("🚨 Failure issue #{$num} updated: {$org}/mokoplatform#{$num}", 'WARN');
+            } else {
+                $issue = $this->api->post("/repos/{$org}/mokoplatform/issues", [
+                    'title'     => $title,
+                    'body'      => $body,
+                    'labels'    => $this->resolveLabelIds($org, 'mokoplatform', ['sync-failure']),
+                    'assignees' => ['jmiller'],
+                ]);
+                $num = $issue['number'] ?? '?';
+                $this->log("🚨 Failure issue created: {$org}/mokoplatform#{$num}", 'WARN');
+>>>>>>> main
             }
         } catch (\Exception $e) {
             $this->log("⚠️  Could not create/update failure issue: " . $e->getMessage(), 'WARN');

automation/ci-issue-reporter.sh

@@ -0,0 +1,237 @@
+#!/usr/bin/env bash
+# ============================================================================
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Automation.CI
+# INGROUP: MokoCLI.Automation
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# PATH: /automation/ci-issue-reporter.sh
+# VERSION: 09.23.00
+# BRIEF: Creates or updates a Gitea issue when a CI gate fails.
+#        Deduplicates by searching open issues with the "ci-auto" label
+#        whose title matches the gate. If a matching issue exists, a comment
+#        is appended instead of opening a duplicate.
+# ============================================================================
+
+set -euo pipefail
+
+# ── Defaults ────────────────────────────────────────────────────────────────
+GITEA_URL="${GITEA_URL:-https://git.mokoconsulting.tech}"
+GITEA_TOKEN="${GITEA_TOKEN:-}"
+REPO="${GITHUB_REPOSITORY:-}"
+RUN_URL="${GITHUB_SERVER_URL:-${GITEA_URL}}/${REPO}/actions/runs/${GITHUB_RUN_ID:-0}"
+LABEL_NAME="ci-auto"
+LABEL_COLOR="#e11d48"
+
+GATE=""
+DETAILS=""
+SEVERITY="error"
+WORKFLOW=""
+
+# ── Parse arguments ─────────────────────────────────────────────────────────
+usage() {
+  cat <<EOF
+Usage: ci-issue-reporter.sh --gate NAME --details TEXT [OPTIONS]
+
+Required:
+  --gate      CI gate name (e.g. "Code Quality", "Self-Health")
+  --details   Human-readable failure description
+
+Optional:
+  --severity  "error" (default) or "warning"
+  --workflow  Workflow name for the issue title
+  --repo      owner/repo (default: \$GITHUB_REPOSITORY)
+  --run-url   URL to the CI run (auto-detected from env)
+  --token     Gitea API token (default: \$GITEA_TOKEN)
+  --url       Gitea base URL (default: \$GITEA_URL)
+EOF
+  exit 1
+}
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --gate)     GATE="$2";       shift 2 ;;
+    --details)  DETAILS="$2";    shift 2 ;;
+    --severity) SEVERITY="$2";   shift 2 ;;
+    --workflow) WORKFLOW="$2";   shift 2 ;;
+    --repo)     REPO="$2";      shift 2 ;;
+    --run-url)  RUN_URL="$2";   shift 2 ;;
+    --token)    GITEA_TOKEN="$2"; shift 2 ;;
+    --url)      GITEA_URL="$2"; shift 2 ;;
+    -h|--help)  usage ;;
+    *)          echo "Unknown option: $1"; usage ;;
+  esac
+done
+
+[[ -z "$GATE" ]]         && { echo "ERROR: --gate is required"; usage; }
+[[ -z "$DETAILS" ]]      && { echo "ERROR: --details is required"; usage; }
+[[ -z "$GITEA_TOKEN" ]]  && { echo "ERROR: GITEA_TOKEN not set"; exit 1; }
+[[ -z "$REPO" ]]         && { echo "ERROR: GITHUB_REPOSITORY not set"; exit 1; }
+
+API="${GITEA_URL}/api/v1/repos/${REPO}"
+
+# ── Build title ─────────────────────────────────────────────────────────────
+if [[ -n "$WORKFLOW" ]]; then
+  TITLE="[CI] ${WORKFLOW}: ${GATE} failed"
+else
+  TITLE="[CI] ${GATE} failed"
+fi
+
+# ── Ensure label exists ─────────────────────────────────────────────────────
+ensure_label() {
+  local exists
+  exists=$(curl -sf -o /dev/null -w '%{http_code}' \
+    -H "Authorization: token ${GITEA_TOKEN}" \
+    "${API}/labels" 2>/dev/null || echo "000")
+
+  if [[ "$exists" == "200" ]]; then
+    # Check if label already exists
+    local found
+    found=$(curl -sf \
+      -H "Authorization: token ${GITEA_TOKEN}" \
+      "${API}/labels" 2>/dev/null \
+      | grep -o "\"name\":\"${LABEL_NAME}\"" || true)
+
+    if [[ -z "$found" ]]; then
+      curl -sf -X POST \
+        -H "Authorization: token ${GITEA_TOKEN}" \
+        -H "Content-Type: application/json" \
+        "${API}/labels" \
+        -d "{\"name\":\"${LABEL_NAME}\",\"color\":\"${LABEL_COLOR}\",\"description\":\"Auto-created by CI issue reporter\"}" \
+        > /dev/null 2>&1 || true
+    fi
+  fi
+}
+
+# ── Search for existing open issue ──────────────────────────────────────────
+find_existing_issue() {
+  # URL-encode the gate name for the query
+  local query
+  query=$(printf '%s' "[CI] ${GATE}" | sed 's/ /%20/g; s/\[/%5B/g; s/\]/%5D/g')
+
+  local response
+  response=$(curl -sf \
+    -H "Authorization: token ${GITEA_TOKEN}" \
+    "${API}/issues?type=issues&state=open&labels=${LABEL_NAME}&q=${query}&limit=5" \
+    2>/dev/null || echo "[]")
+
+  # Extract the first matching issue number
+  echo "$response" \
+    | grep -oP '"number":\s*\K[0-9]+' \
+    | head -1
+}
+
+# ── Build issue body ────────────────────────────────────────────────────────
+build_body() {
+  local severity_badge
+  if [[ "$SEVERITY" == "error" ]]; then
+    severity_badge="**Severity:** Error"
+  else
+    severity_badge="**Severity:** Warning"
+  fi
+
+  cat <<BODY
+## CI Gate Failure: ${GATE}
+
+${severity_badge}
+**Workflow:** ${WORKFLOW:-unknown}
+**Branch:** ${GITHUB_REF_NAME:-unknown}
+**Commit:** \`${GITHUB_SHA:0:8}\`
+**Run:** [View CI run](${RUN_URL})
+
+### Details
+
+${DETAILS}
+
+### Resolution
+
+Fix the issue described above and push a new commit. This issue will be closed automatically when the gate passes, or can be closed manually.
+
+---
+*Auto-created by [ci-issue-reporter](${GITEA_URL}/${REPO}/src/branch/main/automation/ci-issue-reporter.sh)*
+BODY
+}
+
+# ── Build comment body (for existing issues) ────────────────────────────────
+build_comment() {
+  cat <<COMMENT
+### CI failure recurrence
+
+**Branch:** ${GITHUB_REF_NAME:-unknown}
+**Commit:** \`${GITHUB_SHA:0:8}\`
+**Run:** [View CI run](${RUN_URL})
+
+${DETAILS}
+COMMENT
+}
+
+# ── Main ────────────────────────────────────────────────────────────────────
+ensure_label
+
+EXISTING=$(find_existing_issue)
+
+if [[ -n "$EXISTING" ]]; then
+  # Append comment to existing issue
+  COMMENT_BODY=$(build_comment)
+  COMMENT_JSON=$(printf '%s' "$COMMENT_BODY" | python3 -c "
+import sys, json
+print(json.dumps({'body': sys.stdin.read()}))" 2>/dev/null)
+
+  HTTP=$(curl -sf -o /dev/null -w '%{http_code}' -X POST \
+    -H "Authorization: token ${GITEA_TOKEN}" \
+    -H "Content-Type: application/json" \
+    "${API}/issues/${EXISTING}/comments" \
+    -d "${COMMENT_JSON}" 2>/dev/null || echo "000")
+
+  if [[ "$HTTP" == "201" ]]; then
+    echo "Commented on existing issue #${EXISTING}"
+  else
+    echo "WARNING: Failed to comment on issue #${EXISTING} (HTTP ${HTTP})"
+  fi
+else
+  # Create new issue
+  ISSUE_BODY=$(build_body)
+  ISSUE_JSON=$(python3 -c "
+import sys, json
+body = sys.stdin.read()
+print(json.dumps({
+    'title': sys.argv[1],
+    'body': body,
+    'labels': []
+}))" "$TITLE" <<< "$ISSUE_BODY" 2>/dev/null)
+
+  # Create the issue
+  RESPONSE=$(curl -sf -X POST \
+    -H "Authorization: token ${GITEA_TOKEN}" \
+    -H "Content-Type: application/json" \
+    "${API}/issues" \
+    -d "${ISSUE_JSON}" 2>/dev/null || echo "{}")
+
+  ISSUE_NUM=$(echo "$RESPONSE" | grep -oP '"number":\s*\K[0-9]+' | head -1)
+
+  if [[ -n "$ISSUE_NUM" ]]; then
+    # Apply label (separate call — more reliable across Gitea versions)
+    LABEL_ID=$(curl -sf \
+      -H "Authorization: token ${GITEA_TOKEN}" \
+      "${API}/labels" 2>/dev/null \
+      | grep -oP "\"id\":\s*\K[0-9]+(?=[^}]*\"name\":\s*\"${LABEL_NAME}\")" \
+      | head -1 || true)
+
+    if [[ -n "$LABEL_ID" ]]; then
+      curl -sf -X POST \
+        -H "Authorization: token ${GITEA_TOKEN}" \
+        -H "Content-Type: application/json" \
+        "${API}/issues/${ISSUE_NUM}/labels" \
+        -d "{\"labels\":[${LABEL_ID}]}" \
+        > /dev/null 2>&1 || true
+    fi
+
+    echo "Created issue #${ISSUE_NUM}: ${TITLE}"
+  else
+    echo "WARNING: Failed to create issue"
+    echo "Response: ${RESPONSE}"
+  fi
+fi

automation/enrich_manifest_xml.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
+<<<<<<< HEAD
+ * DEFGROUP: MokoCLI.Automation
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
  * DEFGROUP: MokoPlatform.Automation
  * INGROUP: MokoPlatform
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /automation/enrich_manifest_xml.php
  * BRIEF: Enrich XML manifests with repo-specific build and deploy details
  *
@@ -21,8 +27,8 @@ declare(strict_types=1);
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
-use MokoEnterprise\MokoStandardsParser;
+use MokoCli\ManifestParser;
 
 class EnrichManifestXmlCli extends CliFramework
 {
@@ -43,10 +49,14 @@ class EnrichManifestXmlCli extends CliFramework
         $skipStr    = $this->getArgument('--skip');
         $skipRepos  = $skipStr !== '' ? array_map('trim', explode(',', $skipStr)) : [];
 
-        $parser = new MokoStandardsParser();
+        $parser = new ManifestParser();
         $tmpBase = sys_get_temp_dir() . '/moko-enrich-' . getmypid();
 
-        echo "=== moko-platform XML Manifest Enrichment ===\n";
+<<<<<<< HEAD
+        echo "=== MokoCLI XML Manifest Enrichment ===\n";
+=======
+        echo "=== mokoplatform XML Manifest Enrichment ===\n";
+>>>>>>> main
         echo "Mode: " . ($this->dryRun ? "DRY RUN" : "LIVE") . "\n";
         if (!empty($skipRepos)) {
             echo "Skipping: " . implode(', ', $skipRepos) . "\n";
@@ -97,7 +107,11 @@ class EnrichManifestXmlCli extends CliFramework
             }
 
             $manifestPath = "{$workDir}/.mokogitea/manifest.xml";
-            if (!file_exists($manifestPath) || !str_contains(file_get_contents($manifestPath), '<moko-platform')) {
+<<<<<<< HEAD
+            if (!file_exists($manifestPath) || !str_contains(file_get_contents($manifestPath), '<MokoCLI')) {
+=======
+            if (!file_exists($manifestPath) || !str_contains(file_get_contents($manifestPath), '<mokoplatform')) {
+>>>>>>> main
                 echo "SKIP (no XML manifest)\n";
                 $stats['skipped']++;
                 $this->rmTree($workDir);
@@ -113,8 +127,8 @@ class EnrichManifestXmlCli extends CliFramework
             }
             $enrichment['build']['language'] = $enrichment['build']['language']
                 ?? $repo['language']
-                ?? MokoStandardsParser::platformLanguage($platform);
+                ?? ManifestParser::platformLanguage($platform);
-            $enrichment['build']['package_type'] = $enrichment['build']['package_type'] ?? MokoStandardsParser::platformPackageType($platform);
+            $enrichment['build']['package_type'] = $enrichment['build']['package_type'] ?? ManifestParser::platformPackageType($platform);
 
             $enrichedXml = $this->enrichManifestXml($existingXml, $enrichment);
             $dc = count($enrichment['deploy'] ?? []);
@@ -312,7 +326,7 @@ class EnrichManifestXmlCli extends CliFramework
             return $xml;
         }
 
-        $ns = MokoStandardsParser::NAMESPACE_URI;
+        $ns = ManifestParser::NAMESPACE_URI;
         $root = $dom->documentElement;
 
         foreach (['build', 'deploy', 'scripts'] as $tag) {

automation/enrich_mokostandards_xml.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
+<<<<<<< HEAD
+ * DEFGROUP: MokoCLI.Automation
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
  * DEFGROUP: MokoPlatform.Automation
  * INGROUP: MokoPlatform
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /automation/enrich_mokostandards_xml.php
  * BRIEF: Enrich XML manifests with repo-specific build and deploy details
  *
@@ -21,8 +27,8 @@ declare(strict_types=1);
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
-use MokoEnterprise\MokoStandardsParser;
+use MokoCli\ManifestParser;
 
 class EnrichMokostandardsXmlCli extends CliFramework
 {
@@ -43,10 +49,14 @@ class EnrichMokostandardsXmlCli extends CliFramework
         $skipStr    = $this->getArgument('--skip');
         $skipRepos  = $skipStr !== '' ? array_map('trim', explode(',', $skipStr)) : [];
 
-        $parser = new MokoStandardsParser();
+        $parser = new ManifestParser();
         $tmpBase = sys_get_temp_dir() . '/moko-enrich-' . getmypid();
 
-        echo "=== moko-platform XML Manifest Enrichment ===\n";
+<<<<<<< HEAD
+        echo "=== MokoCLI XML Manifest Enrichment ===\n";
+=======
+        echo "=== mokoplatform XML Manifest Enrichment ===\n";
+>>>>>>> main
         echo "Mode: " . ($this->dryRun ? "DRY RUN" : "LIVE") . "\n";
         if (!empty($skipRepos)) {
             echo "Skipping: " . implode(', ', $skipRepos) . "\n";
@@ -97,7 +107,11 @@ class EnrichMokostandardsXmlCli extends CliFramework
             }
 
             $manifestPath = "{$workDir}/.mokogitea/manifest.xml";
-            if (!file_exists($manifestPath) || !str_contains(file_get_contents($manifestPath), '<moko-platform')) {
+<<<<<<< HEAD
+            if (!file_exists($manifestPath) || !str_contains(file_get_contents($manifestPath), '<MokoCLI')) {
+=======
+            if (!file_exists($manifestPath) || !str_contains(file_get_contents($manifestPath), '<mokoplatform')) {
+>>>>>>> main
                 echo "SKIP (no XML manifest)\n";
                 $stats['skipped']++;
                 $this->rmTree($workDir);
@@ -113,8 +127,8 @@ class EnrichMokostandardsXmlCli extends CliFramework
             }
             $enrichment['build']['language'] = $enrichment['build']['language']
                 ?? $repo['language']
-                ?? MokoStandardsParser::platformLanguage($platform);
+                ?? ManifestParser::platformLanguage($platform);
-            $enrichment['build']['package_type'] = $enrichment['build']['package_type'] ?? MokoStandardsParser::platformPackageType($platform);
+            $enrichment['build']['package_type'] = $enrichment['build']['package_type'] ?? ManifestParser::platformPackageType($platform);
 
             $enrichedXml = $this->enrichManifestXml($existingXml, $enrichment);
             $dc = count($enrichment['deploy'] ?? []);
@@ -315,7 +329,7 @@ class EnrichMokostandardsXmlCli extends CliFramework
             return $xml;
         }
 
-        $ns = MokoStandardsParser::NAMESPACE_URI;
+        $ns = ManifestParser::NAMESPACE_URI;
         $root = $dom->documentElement;
 
         foreach (['build', 'deploy', 'scripts'] as $tag) {

automation/index.md

@@ -2,9 +2,15 @@
 Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 SPDX-License-Identifier: GPL-3.0-or-later
 FILE INFORMATION
+<<<<<<< HEAD
+DEFGROUP: MokoCLI.Index
+INGROUP: MokoCLI.Automation
+REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
 DEFGROUP: MokoPlatform.Index
 INGROUP: MokoPlatform.Automation
-REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
 PATH: /automation/index.md
 BRIEF: Automation directory index
 -->

automation/migrate_to_gitea.php

@@ -8,16 +8,26 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
+<<<<<<< HEAD
+ * DEFGROUP: MokoCLI.Automation
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
  * DEFGROUP: MokoPlatform.Automation
  * INGROUP: MokoPlatform
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /automation/migrate_to_gitea.php
  * BRIEF: Migrate repositories from GitHub to self-hosted Gitea instance
  *
  * USAGE
  *   php automation/migrate_to_gitea.php --dry-run
  *   php automation/migrate_to_gitea.php --repos MokoCRM MokoDoliMods
- *   php automation/migrate_to_gitea.php --exclude moko-platform --skip-archived
+<<<<<<< HEAD
+ *   php automation/migrate_to_gitea.php --exclude MokoCLI --skip-archived
+=======
+ *   php automation/migrate_to_gitea.php --exclude mokoplatform --skip-archived
+>>>>>>> main
  *   php automation/migrate_to_gitea.php --resume
  */
 
@@ -25,12 +35,12 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-use MokoEnterprise\CheckpointManager;
+use MokoCli\CheckpointManager;
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
-use MokoEnterprise\Config;
+use MokoCli\Config;
-use MokoEnterprise\PlatformAdapterFactory;
+use MokoCli\PlatformAdapterFactory;
-use MokoEnterprise\GitHubAdapter;
+use MokoCli\GitHubAdapter;
-use MokoEnterprise\MokoGiteaAdapter;
+use MokoCli\MokoGiteaAdapter;
 
 /**
  * Gitea Migration Script
@@ -278,7 +288,11 @@ class MigrateToGitea extends CliFramework
         try {
             $this->gitea->createIssue(
                 $giteaOrg,
-                'moko-platform',
+<<<<<<< HEAD
+                'MokoCLI',
+=======
+                'mokoplatform',
+>>>>>>> main
                 'chore: GitHub → Gitea migration report — ' . count($results['migrated']) . ' repos migrated',
                 $report,
                 ['labels' => ['automation', 'type: chore']]

automation/push_files.php

@@ -9,9 +9,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
+<<<<<<< HEAD
+ * DEFGROUP: MokoCLI.Automation
+ * INGROUP: MokoCLI.Scripts
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
  * DEFGROUP: MokoPlatform.Automation
  * INGROUP: MokoPlatform.Scripts
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /automation/push_files.php
  * BRIEF: Push one or more specific files to one or more remote repositories
  */
@@ -21,7 +27,7 @@ declare(strict_types=1);
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\{
+use MokoCli\{
     ApiClient,
     AuditLogger,
     CliFramework,
@@ -35,7 +41,11 @@ use MokoEnterprise\{
 /**
  * Targeted File Push Tool
  *
- * Pushes one or more specific files from moko-platform templates to one or
+<<<<<<< HEAD
+ * Pushes one or more specific files from MokoCLI templates to one or
+=======
+ * Pushes one or more specific files from mokoplatform templates to one or
+>>>>>>> main
  * more remote repositories — without running a full sync.
  *
  * Files are specified by their destination path as they appear in the target
@@ -81,7 +91,11 @@ class PushFiles extends CliFramework
      */
     protected function run(): int
     {
-        $this->log('📦 moko-platform File Push v' . self::VERSION, 'INFO');
+<<<<<<< HEAD
+        $this->log('📦 MokoCLI File Push v' . self::VERSION, 'INFO');
+=======
+        $this->log('📦 mokoplatform File Push v' . self::VERSION, 'INFO');
+>>>>>>> main
 
         if (!$this->initializeComponents()) {
             return 1;
@@ -230,7 +244,8 @@ class PushFiles extends CliFramework
     {
         // Read platform from repo's .mokogitea/manifest.xml via API
         try {
-            $manifestData = $this->adapter->getFileContent($org, $repo, '.mokogitea/manifest.xml', 'main');
+            $fileInfo = $this->adapter->getFileContents($org, $repo, '.mokogitea/manifest.xml', 'main');
+            $manifestData = isset($fileInfo['content']) ? base64_decode($fileInfo['content']) : '';
             if (!empty($manifestData)) {
                 $xml = @simplexml_load_string($manifestData);
                 if ($xml !== false) {
@@ -336,7 +351,11 @@ class PushFiles extends CliFramework
 
                 $prNumber = null;
                 if (!$direct) {
-                    $prTitle  = "chore: push " . count($entries) . " file(s) from moko-platform";
+<<<<<<< HEAD
+                    $prTitle  = "chore: push " . count($entries) . " file(s) from MokoCLI";
+=======
+                    $prTitle  = "chore: push " . count($entries) . " file(s) from mokoplatform";
+>>>>>>> main
                     $prBody   = $this->buildPRBody($entries);
                     $pr       = $this->adapter->createPullRequest(
                         $org,
@@ -413,7 +432,11 @@ class PushFiles extends CliFramework
 
         $message = !empty($customMessage)
             ? $customMessage
-            : "chore: update {$destPath} from moko-platform";
+<<<<<<< HEAD
+            : "chore: update {$destPath} from MokoCLI";
+=======
+            : "chore: update {$destPath} from mokoplatform";
+>>>>>>> main
 
         // Fetch existing file SHA (needed for updates)
         $existingSha = null;
@@ -456,9 +479,15 @@ class PushFiles extends CliFramework
     ): void {
         $now     = gmdate('Y-m-d H:i:s') . ' UTC';
         $version = self::VERSION;
-        $source  = $this->adapter->getRepoWebUrl($org, 'moko-platform');
+<<<<<<< HEAD
+        $source  = $this->adapter->getRepoWebUrl($org, 'MokoCLI');
 
-        $title = "chore: moko-platform file push tracking";
+        $title = "chore: MokoCLI file push tracking";
+=======
+        $source  = $this->adapter->getRepoWebUrl($org, 'mokoplatform');
+
+        $title = "chore: mokoplatform file push tracking";
+>>>>>>> main
 
         $deliveryLine = $prNumber !== null
             ? "| **Pull request** | [#{$prNumber}](" . $this->adapter->getPullRequestWebUrl($org, $repo, $prNumber) . ") |"
@@ -470,9 +499,15 @@ class PushFiles extends CliFramework
         ));
 
         $body = <<<MD
-        ## moko-platform File Push
+<<<<<<< HEAD
+        ## MokoCLI File Push
 
-        One or more files were pushed to this repository from moko-platform.
+        One or more files were pushed to this repository from MokoCLI.
+=======
+        ## mokoplatform File Push
+
+        One or more files were pushed to this repository from mokoplatform.
+>>>>>>> main
 
         | Field | Value |
         |-------|-------|
@@ -486,12 +521,20 @@ class PushFiles extends CliFramework
         {$fileRows}
 
         ---
-        *Generated automatically by [moko-platform]({$source}) `push_files.php`*
+<<<<<<< HEAD
+        *Generated automatically by [MokoCLI]({$source}) `push_files.php`*
+=======
+        *Generated automatically by [mokoplatform]({$source}) `push_files.php`*
+>>>>>>> main
         MD;
 
         $body = preg_replace('/^        /m', '', $body);
 
-        $labels = ['standards-update', 'moko-platform', 'type: chore', 'automation'];
+<<<<<<< HEAD
+        $labels = ['standards-update', 'MokoCLI', 'type: chore', 'automation'];
+=======
+        $labels = ['standards-update', 'mokoplatform', 'type: chore', 'automation'];
+>>>>>>> main
 
         try {
             $existing = $this->api->get("/repos/{$org}/{$repo}/issues", [
@@ -549,7 +592,11 @@ class PushFiles extends CliFramework
     }
 
     /**
-     * Create or update a failure issue in moko-platform when repos fail to receive files.
+<<<<<<< HEAD
+     * Create or update a failure issue in MokoCLI when repos fail to receive files.
+=======
+     * Create or update a failure issue in mokoplatform when repos fail to receive files.
+>>>>>>> main
      * Uses the 'push-failure' label. Reopens a closed issue rather than creating a duplicate.
      */
     private function createFailureIssue(string $org, array $results): void
@@ -597,7 +644,11 @@ class PushFiles extends CliFramework
         $body = preg_replace('/^        /m', '', $body);
 
         try {
-            $existing = $this->api->get("/repos/{$org}/moko-platform/issues", [
+<<<<<<< HEAD
+            $existing = $this->api->get("/repos/{$org}/MokoCLI/issues", [
+=======
+            $existing = $this->api->get("/repos/{$org}/mokoplatform/issues", [
+>>>>>>> main
                 'labels'    => 'push-failure',
                 'state'     => 'all',
                 'per_page'  => 1,
@@ -612,17 +663,28 @@ class PushFiles extends CliFramework
                 if (($existing[0]['state'] ?? 'open') === 'closed') {
                     $patch['state'] = 'open';
                 }
-                $this->api->patch("/repos/{$org}/moko-platform/issues/{$num}", $patch);
+<<<<<<< HEAD
-                $this->log("🚨 Failure issue #{$num} updated: {$org}/moko-platform#{$num}", 'WARN');
+                $this->api->patch("/repos/{$org}/MokoCLI/issues/{$num}", $patch);
+                $this->log("🚨 Failure issue #{$num} updated: {$org}/MokoCLI#{$num}", 'WARN');
             } else {
-                $issue = $this->api->post("/repos/{$org}/moko-platform/issues", [
+                $issue = $this->api->post("/repos/{$org}/MokoCLI/issues", [
+=======
+                $this->api->patch("/repos/{$org}/mokoplatform/issues/{$num}", $patch);
+                $this->log("🚨 Failure issue #{$num} updated: {$org}/mokoplatform#{$num}", 'WARN');
+            } else {
+                $issue = $this->api->post("/repos/{$org}/mokoplatform/issues", [
+>>>>>>> main
                     'title'     => $title,
                     'body'      => $body,
                     'labels'    => ['push-failure'],
                     'assignees' => ['jmiller'],
                 ]);
                 $num = $issue['number'] ?? '?';
-                $this->log("🚨 Failure issue created: {$org}/moko-platform#{$num}", 'WARN');
+<<<<<<< HEAD
+                $this->log("🚨 Failure issue created: {$org}/MokoCLI#{$num}", 'WARN');
+=======
+                $this->log("🚨 Failure issue created: {$org}/mokoplatform#{$num}", 'WARN');
+>>>>>>> main
             }
         } catch (\Exception $e) {
             $this->log("⚠️  Could not create/update failure issue: " . $e->getMessage(), 'WARN');
@@ -637,14 +699,23 @@ class PushFiles extends CliFramework
     private function buildPRBody(array $entries): string
     {
         $now   = gmdate('Y-m-d H:i:s') . ' UTC';
-        $lines = ["## moko-platform File Push\n", "**Pushed:** {$now}\n", '### Files\n'];
+<<<<<<< HEAD
+        $lines = ["## MokoCLI File Push\n", "**Pushed:** {$now}\n", '### Files\n'];
+=======
+        $lines = ["## mokoplatform File Push\n", "**Pushed:** {$now}\n", '### Files\n'];
+>>>>>>> main
 
         foreach ($entries as $entry) {
             $lines[] = "- `{$entry['destination']}`";
         }
 
-        $sourceUrl = $this->adapter->getRepoWebUrl(self::DEFAULT_ORG, 'moko-platform');
+<<<<<<< HEAD
-        $lines[] = "\n---\n*Generated by [moko-platform]({$sourceUrl}) `push_files.php`*";
+        $sourceUrl = $this->adapter->getRepoWebUrl(self::DEFAULT_ORG, 'MokoCLI');
+        $lines[] = "\n---\n*Generated by [MokoCLI]({$sourceUrl}) `push_files.php`*";
+=======
+        $sourceUrl = $this->adapter->getRepoWebUrl(self::DEFAULT_ORG, 'mokoplatform');
+        $lines[] = "\n---\n*Generated by [mokoplatform]({$sourceUrl}) `push_files.php`*";
+>>>>>>> main
 
         return implode("\n", $lines);
     }

automation/push_manifest_xml.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
+<<<<<<< HEAD
+ * DEFGROUP: MokoCLI.Automation
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
  * DEFGROUP: MokoPlatform.Automation
  * INGROUP: MokoPlatform
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /automation/push_manifest_xml.php
  * BRIEF: Push XML manifests to all governed repositories
  */
@@ -18,8 +24,8 @@ declare(strict_types=1);
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
-use MokoEnterprise\MokoStandardsParser;
+use MokoCli\ManifestParser;
 
 class PushManifestXmlCli extends CliFramework
 {
@@ -44,10 +50,14 @@ class PushManifestXmlCli extends CliFramework
         $skipStr    = $this->getArgument('--skip');
         $skipRepos  = $skipStr !== '' ? array_map('trim', explode(',', $skipStr)) : [];
 
-        $parser = new MokoStandardsParser();
+        $parser = new ManifestParser();
         $tmpBase = sys_get_temp_dir() . '/moko-manifest-push-' . getmypid();
 
-        echo "=== moko-platform XML Manifest Push ===\n";
+<<<<<<< HEAD
+        echo "=== MokoCLI XML Manifest Push ===\n";
+=======
+        echo "=== mokoplatform XML Manifest Push ===\n";
+>>>>>>> main
         echo "Org: {$giteaOrg}\n";
         echo "Mode: " . ($this->dryRun ? "DRY RUN" : "LIVE") . "\n";
         if ($repoFilter) {
@@ -97,8 +107,8 @@ class PushManifestXmlCli extends CliFramework
                 'description'       => $repo['description'] ?? '',
                 'license'           => 'GPL-3.0-or-later',
                 'topics'            => $repo['topics'] ?? [],
-                'language'          => $repo['language'] ?? MokoStandardsParser::platformLanguage($platform),
+                'language'          => $repo['language'] ?? ManifestParser::platformLanguage($platform),
-                'package_type'      => MokoStandardsParser::platformPackageType($platform),
+                'package_type'      => ManifestParser::platformPackageType($platform),
                 'last_synced'       => date('c'),
             ]);
 
@@ -125,7 +135,11 @@ class PushManifestXmlCli extends CliFramework
 
             // Check if already XML and up-to-date
             $manifestPath = "{$workDir}/.mokogitea/manifest.xml";
-            $existingIsXml = file_exists($manifestPath) && str_contains(file_get_contents($manifestPath), '<moko-platform');
+<<<<<<< HEAD
+            $existingIsXml = file_exists($manifestPath) && str_contains(file_get_contents($manifestPath), '<MokoCLI');
+=======
+            $existingIsXml = file_exists($manifestPath) && str_contains(file_get_contents($manifestPath), '<mokoplatform');
+>>>>>>> main
             if ($existingIsXml && !$force) {
                 $existingPlatform = $parser->extractPlatform(file_get_contents($manifestPath));
                 if ($existingPlatform === $platform) {

automation/push_mokostandards_xml.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
+<<<<<<< HEAD
+ * DEFGROUP: MokoCLI.Automation
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
  * DEFGROUP: MokoPlatform.Automation
  * INGROUP: MokoPlatform
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /automation/push_mokostandards_xml.php
  * BRIEF: Push XML manifests to all governed repositories
  */
@@ -18,8 +24,8 @@ declare(strict_types=1);
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
-use MokoEnterprise\MokoStandardsParser;
+use MokoCli\ManifestParser;
 
 class PushMokostandardsXmlCli extends CliFramework
 {
@@ -44,10 +50,14 @@ class PushMokostandardsXmlCli extends CliFramework
         $skipStr    = $this->getArgument('--skip');
         $skipRepos  = $skipStr !== '' ? array_map('trim', explode(',', $skipStr)) : [];
 
-        $parser = new MokoStandardsParser();
+        $parser = new ManifestParser();
         $tmpBase = sys_get_temp_dir() . '/moko-manifest-push-' . getmypid();
 
-        echo "=== moko-platform XML Manifest Push ===\n";
+<<<<<<< HEAD
+        echo "=== MokoCLI XML Manifest Push ===\n";
+=======
+        echo "=== mokoplatform XML Manifest Push ===\n";
+>>>>>>> main
         echo "Org: {$giteaOrg}\n";
         echo "Mode: " . ($this->dryRun ? "DRY RUN" : "LIVE") . "\n";
         if ($repoFilter) {
@@ -97,8 +107,8 @@ class PushMokostandardsXmlCli extends CliFramework
                 'description'       => $repo['description'] ?? '',
                 'license'           => 'GPL-3.0-or-later',
                 'topics'            => $repo['topics'] ?? [],
-                'language'          => $repo['language'] ?? MokoStandardsParser::platformLanguage($platform),
+                'language'          => $repo['language'] ?? ManifestParser::platformLanguage($platform),
-                'package_type'      => MokoStandardsParser::platformPackageType($platform),
+                'package_type'      => ManifestParser::platformPackageType($platform),
                 'last_synced'       => date('c'),
             ]);
 
@@ -125,7 +135,11 @@ class PushMokostandardsXmlCli extends CliFramework
 
             // Check if already XML and up-to-date
             $manifestPath = "{$workDir}/.mokogitea/manifest.xml";
-            $existingIsXml = file_exists($manifestPath) && str_contains(file_get_contents($manifestPath), '<moko-platform');
+<<<<<<< HEAD
+            $existingIsXml = file_exists($manifestPath) && str_contains(file_get_contents($manifestPath), '<MokoCLI');
+=======
+            $existingIsXml = file_exists($manifestPath) && str_contains(file_get_contents($manifestPath), '<mokoplatform');
+>>>>>>> main
             if ($existingIsXml && !$force) {
                 $existingPlatform = $parser->extractPlatform(file_get_contents($manifestPath));
                 if ($existingPlatform === $platform) {

automation/repo_cleanup.php

@@ -9,9 +9,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
+<<<<<<< HEAD
+ * DEFGROUP: MokoCLI.Automation
+ * INGROUP: MokoCLI.Scripts
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
  * DEFGROUP: MokoPlatform.Automation
  * INGROUP: MokoPlatform.Scripts
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /automation/repo_cleanup.php
  * BRIEF: Enterprise repository cleanup — branches, PRs, issues, workflows, labels, logs
  */
@@ -21,7 +27,7 @@ declare(strict_types=1);
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\{ApiClient, AuditLogger, CliFramework, Config, GitPlatformAdapter, MetricsCollector, PlatformAdapterFactory};
+use MokoCli\{ApiClient, AuditLogger, CliFramework, Config, GitPlatformAdapter, MetricsCollector, PlatformAdapterFactory};
 
 /**
  * Enterprise Repository Cleanup
@@ -39,14 +45,23 @@ use MokoEnterprise\{ApiClient, AuditLogger, CliFramework, Config, GitPlatformAda
 class RepoCleanup extends CliFramework
 {
     private const VERSION        = '09.23.00';
-    private const SYNC_PREFIX    = 'chore/sync-moko-platform-';
+<<<<<<< HEAD
-    private const CURRENT_BRANCH = 'chore/sync-moko-platform-v04.02.00';
+    private const SYNC_PREFIX    = 'chore/sync-MokoCLI-';
+    private const CURRENT_BRANCH = 'chore/sync-MokoCLI-v04.02.00';
+=======
+    private const SYNC_PREFIX    = 'chore/sync-mokoplatform-';
+    private const CURRENT_BRANCH = 'chore/sync-mokoplatform-v04.02.00';
+>>>>>>> main
 
     /** Workflow files that have been retired and should be deleted from governed repos. */
     private const RETIRED_WORKFLOWS = [
         'build.yml', 'code-quality.yml', 'release-cycle.yml', 'release-pipeline.yml',
         'branch-cleanup.yml', 'auto-update-changelog.yml', 'enterprise-issue-manager.yml',
-        'flush-actions-cache.yml', 'moko-platform-script-runner.yml', 'unified-ci.yml',
+<<<<<<< HEAD
+        'flush-actions-cache.yml', 'MokoCLI-script-runner.yml', 'unified-ci.yml',
+=======
+        'flush-actions-cache.yml', 'mokoplatform-script-runner.yml', 'unified-ci.yml',
+>>>>>>> main
         'unified-platform-testing.yml', 'reusable-build.yml', 'reusable-ci-validation.yml',
         'reusable-deploy.yml', 'reusable-php-quality.yml', 'reusable-platform-testing.yml',
         'reusable-project-detector.yml', 'reusable-release.yml', 'reusable-script-executor.yml',
@@ -98,7 +113,11 @@ class RepoCleanup extends CliFramework
         }
 
 
-        $this->logMsg("🧹 moko-platform Repository Cleanup v" . self::VERSION);
+<<<<<<< HEAD
+        $this->logMsg("🧹 MokoCLI Repository Cleanup v" . self::VERSION);
+=======
+        $this->logMsg("🧹 mokoplatform Repository Cleanup v" . self::VERSION);
+>>>>>>> main
         $this->logMsg("Organization: {$org}");
         $this->logMsg("Current sync branch: " . self::CURRENT_BRANCH);
         if ($this->dryRun) {
@@ -225,7 +244,11 @@ class RepoCleanup extends CliFramework
         }
 
         $allRepos = $this->adapter->listOrgRepos($org, $skipArchived);
-        return array_filter($allRepos, fn($r) => !in_array($r['name'], ['moko-platform', '.github-private'], true));
+<<<<<<< HEAD
+        return array_filter($allRepos, fn($r) => !in_array($r['name'], ['MokoCLI', '.github-private'], true));
+=======
+        return array_filter($allRepos, fn($r) => !in_array($r['name'], ['mokoplatform', '.github-private'], true));
+>>>>>>> main
     }
 
     // ─── Cleanup operations ──────────────────────────────────────────────
@@ -463,9 +486,15 @@ class RepoCleanup extends CliFramework
     private function checkLabels(string $org, string $repo, array &$results): void
     {
         try {
-            $this->api->get("/repos/{$org}/{$repo}/labels/moko-platform");
+<<<<<<< HEAD
+            $this->api->get("/repos/{$org}/{$repo}/labels/MokoCLI");
         } catch (\Exception $e) {
-            $this->logMsg("  ⚠️  Missing 'moko-platform' label");
+            $this->logMsg("  ⚠️  Missing 'MokoCLI' label");
+=======
+            $this->api->get("/repos/{$org}/{$repo}/labels/mokoplatform");
+        } catch (\Exception $e) {
+            $this->logMsg("  ⚠️  Missing 'mokoplatform' label");
+>>>>>>> main
             $results['labels_missing']++;
             $this->api->resetCircuitBreaker();
         }
@@ -479,7 +508,11 @@ class RepoCleanup extends CliFramework
             if (preg_match('/^\s*VERSION:\s*(\d{2}\.\d{2}\.\d{2})/m', $content, $m)) {
                 $version = $m[1];
 
-                // Check manifest.xml for the tracked moko-platform version
+<<<<<<< HEAD
+                // Check manifest.xml for the tracked MokoCLI version
+=======
+                // Check manifest.xml for the tracked mokoplatform version
+>>>>>>> main
                 try {
                     $mokoFile = $this->api->get("/repos/{$org}/{$repo}/contents/.mokogitea/manifest.xml");
                     $mokoContent = base64_decode($mokoFile['content'] ?? '');

automation/server-autoheal.sh

@@ -4,9 +4,9 @@
 # Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
-# DEFGROUP: MokoPlatform.Automation.ServerAutoheal
+# DEFGROUP: MokoCLI.Automation.ServerAutoheal
-# INGROUP:  MokoPlatform.Automation
+# INGROUP:  MokoCLI.Automation
-# REPO:     https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# REPO:     https://git.mokoconsulting.tech/MokoConsulting/mokocli
 # PATH:     /automation/server-autoheal.sh
 # BRIEF:    Server auto-heal on unclean restart + split system/content backups
 #

bin/moko

@@ -9,11 +9,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: MokoStandards.CLI
+<<<<<<< HEAD
- * INGROUP: MokoStandards
+ * DEFGROUP: MokoCLI.CLI
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+ * PATH: /bin/moko
+ * BRIEF: Unified CLI dispatcher — run any MokoCLI script without needing GitHub Actions
+=======
+ * DEFGROUP: MokoCli.CLI
+ * INGROUP: MokoCli
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
  * PATH: /bin/moko
- * BRIEF: Unified CLI dispatcher — run any MokoStandards script without needing GitHub Actions
+ * BRIEF: Unified CLI dispatcher — run any MokoCli script without needing GitHub Actions
+>>>>>>> main
  *
  * USAGE
  *   php bin/moko <command> [options]     (all platforms)
@@ -220,6 +228,9 @@ const COMMAND_MAP = [
     // Licensing
     'license'              => 'cli/license_manage.php',
 
+    // Security
+    'security:advisories'  => 'security/advisory_scan.php',
+
     // Shell completion
     'completion'           => 'cli/completion.php',
 
@@ -292,10 +303,17 @@ function printHelp(): void
 {
     echo <<<'HELP'
 ╔══════════════════════════════════════════════════════════╗
-║              MokoStandards CLI  (bin/moko)               ║
+<<<<<<< HEAD
+║                 MokoCLI  (bin/moko)                      ║
 ╚══════════════════════════════════════════════════════════╝
 
-Run any MokoStandards script locally without GitHub Actions.
+Run any MokoCLI script locally without GitHub Actions.
+=======
+║              MokoCli CLI  (bin/moko)               ║
+╚══════════════════════════════════════════════════════════╝
+
+Run any MokoCli script locally without GitHub Actions.
+>>>>>>> main
 
 USAGE
   php bin/moko <command> [options]     (all platforms)
@@ -397,7 +415,7 @@ function loadPluginCommands(): array
     $commands = [];
 
     foreach (glob("{$pluginDir}/*Plugin.php") as $file) {
-        $className = 'MokoEnterprise\\Plugins\\'
+        $className = 'MokoCli\\Plugins\\'
             . pathinfo($file, PATHINFO_FILENAME);
 
         if (!class_exists($className)) {

cli/archive_repo.php

@@ -8,9 +8,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/archive_repo.php
  * BRIEF: Gracefully retire a governed repository — archive, close issues/PRs, remove sync def
  */
@@ -20,9 +26,9 @@ declare(strict_types=1);
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
-use MokoEnterprise\Config;
+use MokoCli\Config;
-use MokoEnterprise\PlatformAdapterFactory;
+use MokoCli\PlatformAdapterFactory;
 
 class ArchiveRepoCli extends CliFramework
 {
@@ -135,7 +141,11 @@ class ArchiveRepoCli extends CliFramework
             try {
                 $issue = $adapter->createIssue(
                     $org,
-                    'moko-platform',
+<<<<<<< HEAD
+                    'MokoCLI',
+=======
+                    'mokoplatform',
+>>>>>>> main
                     "chore: archived repository {$repoName}",
                     "## Repository Archived\n\n"
                     . "**Repository:** `{$org}/{$repoName}`\n"
@@ -150,7 +160,11 @@ class ArchiveRepoCli extends CliFramework
                     ]
                 );
                 if (isset($issue['number'])) {
-                    echo "  Archival record: moko-platform#{$issue['number']}\n";
+<<<<<<< HEAD
+                    echo "  Archival record: MokoCLI#{$issue['number']}\n";
+=======
+                    echo "  Archival record: mokoplatform#{$issue['number']}\n";
+>>>>>>> main
                 }
             } catch (\Exception $e) {
                 echo "  Warning: could not create archival record: " . $e->getMessage() . "\n";

cli/audit_query.php

@@ -14,9 +14,15 @@
  * (at your option) any later version.
  *
  * FILE INFORMATION
+<<<<<<< HEAD
+ * DEFGROUP: MokoCLI.Enterprise.CLI
+ * INGROUP: MokoCLI.Enterprise
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
  * DEFGROUP: MokoPlatform.Enterprise.CLI
  * INGROUP: MokoPlatform.Enterprise
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/audit_query.php
  * BRIEF: Search, filter, and export audit logs
  */
@@ -25,7 +31,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 /**
  * CLI tool to search, filter, and export audit logs.

cli/badge_update.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/badge_update.php
  * BRIEF: Update [VERSION: XX.XX.XX] badges in all markdown files
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class BadgeUpdateCli extends CliFramework
 {

cli/branch_rename.php

@@ -6,11 +6,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/branch_rename.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/branch_rename.php
+ * VERSION: 09.32.00
+>>>>>>> main
  * BRIEF: Rename a git branch via Gitea API (create new, update PR, delete old)
  */
 
@@ -18,7 +26,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class BranchRenameCli extends CliFramework
 {

cli/bulk_workflow_push.php

@@ -8,11 +8,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/bulk_workflow_push.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/bulk_workflow_push.php
+ * VERSION: 09.32.00
+>>>>>>> main
  * BRIEF: Push a workflow file to all governed repos via the Gitea Contents API
  */
 
@@ -20,7 +28,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class BulkWorkflowPushCli extends CliFramework
 {
@@ -154,7 +162,11 @@ class BulkWorkflowPushCli extends CliFramework
                 'content' => $encodedContent,
                 'sha' => $remoteSha,
                 'message' => "chore: sync {$destPath} "
-                    . "from moko-platform [skip ci]",
+<<<<<<< HEAD
+                    . "from MokoCLI [skip ci]",
+=======
+                    . "from mokoplatform [skip ci]",
+>>>>>>> main
                 'branch' => $branch,
             ]);
 
@@ -184,7 +196,11 @@ class BulkWorkflowPushCli extends CliFramework
             $payload = json_encode([
                 'content' => $encodedContent,
                 'message' => "chore: add {$destPath} "
-                    . "from moko-platform [skip ci]",
+<<<<<<< HEAD
+                    . "from MokoCLI [skip ci]",
+=======
+                    . "from mokoplatform [skip ci]",
+>>>>>>> main
                 'branch' => $branch,
             ]);
 

cli/bulk_workflow_trigger.php

@@ -8,11 +8,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/bulk_workflow_trigger.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/bulk_workflow_trigger.php
+ * VERSION: 09.32.00
+>>>>>>> main
  * BRIEF: Trigger a workflow across multiple repos at once
  */
 
@@ -20,7 +28,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class BulkWorkflowTriggerCli extends CliFramework
 {

cli/changelog_promote.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/changelog_promote.php
  * BRIEF: Promote [Unreleased] section in CHANGELOG.md to a versioned entry
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ChangelogPromoteCli extends CliFramework
 {

cli/changelog_prune.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/changelog_prune.php
  * BRIEF: Prune old CHANGELOG.md entries — keeps [Unreleased] + last N releases
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ChangelogPruneCli extends CliFramework
 {

cli/client_dashboard.php

@@ -8,11 +8,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/client_dashboard.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/client_dashboard.php
+ * VERSION: 09.32.00
+>>>>>>> main
  * BRIEF: Generate unified client dashboard HTML
  */
 
@@ -20,7 +28,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ClientDashboardCli extends CliFramework
 {

cli/client_health_check.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/client_health_check.php
  * BRIEF: Verify a client site's update server, installed version, and release availability
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ClientHealthCheckCli extends CliFramework
 {

cli/client_inventory.php

@@ -8,11 +8,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/client_inventory.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/client_inventory.php
+ * VERSION: 09.32.00
+>>>>>>> main
  * BRIEF: Discover and list all client-waas repos with their server configuration status
  */
 
@@ -20,7 +28,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ClientInventoryCli extends CliFramework
 {

cli/client_provision.php

@@ -8,11 +8,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/client_provision.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/client_provision.php
+ * VERSION: 09.32.00
+>>>>>>> main
  * BRIEF: Provision a new client environment end-to-end
  */
 
@@ -20,7 +28,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ClientProvisionCli extends CliFramework
 {

cli/completion.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/completion.php
  * BRIEF: Generate bash/zsh tab completion scripts for bin/moko
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class CompletionCli extends CliFramework
 {

cli/create_project.php

@@ -8,9 +8,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/create_project.php
  * BRIEF: Create baseline GitHub Projects for repositories with standard fields and views
  */
@@ -19,12 +25,16 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class CreateProjectCli extends CliFramework
 {
     /** @var string[] */
-    private array $ALWAYS_EXCLUDE = ['moko-platform', '.github-private'];
+<<<<<<< HEAD
+    private array $ALWAYS_EXCLUDE = ['MokoCLI', '.github-private'];
+=======
+    private array $ALWAYS_EXCLUDE = ['mokoplatform', '.github-private'];
+>>>>>>> main
 
     /** @var array<string, string> */
     private array $PLATFORM_TO_TYPE = [
@@ -80,10 +90,10 @@ class CreateProjectCli extends CliFramework
             return 2;
         }
 
-        $config   = \MokoEnterprise\Config::load();
+        $config   = \MokoCli\Config::load();
         $platformName = $config->getString('platform', 'gitea');
         try {
-            $adapter = \MokoEnterprise\PlatformAdapterFactory::create($config);
+            $adapter = \MokoCli\PlatformAdapterFactory::create($config);
             $api     = $adapter->getApiClient();
         } catch (\Exception $e) {
             $this->log('ERROR', "Platform initialization failed: " . $e->getMessage());
@@ -183,7 +193,11 @@ class CreateProjectCli extends CliFramework
             CURLOPT_HTTPHEADER     => [
                 'Authorization: bearer ' . $token,
                 'Content-Type: application/json',
-                'User-Agent: moko-platform-CreateProject',
+<<<<<<< HEAD
+                'User-Agent: MokoCLI-CreateProject',
+=======
+                'User-Agent: mokoplatform-CreateProject',
+>>>>>>> main
             ],
         ]);
         $body = (string) curl_exec($ch);
@@ -205,7 +219,7 @@ class CreateProjectCli extends CliFramework
         return $data['data'] ?? [];
     }
 
-    private function restGet(string $path, string $token, ?\MokoEnterprise\ApiClient $apiClient = null): array
+    private function restGet(string $path, string $token, ?\MokoCli\ApiClient $apiClient = null): array
     {
         if ($apiClient !== null) {
             try {
@@ -217,7 +231,7 @@ class CreateProjectCli extends CliFramework
         return [];
     }
 
-    private function detectRepoPlatform(string $org, string $repo, string $token, ?\MokoEnterprise\ApiClient $apiClient = null): string
+    private function detectRepoPlatform(string $org, string $repo, string $token, ?\MokoCli\ApiClient $apiClient = null): string
     {
         foreach (['.github/.mokostandards', '.mokogitea/.mokostandards', '.mokostandards'] as $path) {
             $data = $this->restGet("repos/{$org}/{$repo}/contents/{$path}", $token, $apiClient);
@@ -422,14 +436,22 @@ class CreateProjectCli extends CliFramework
                 updateProjectV2(input: {
                     projectId: $projectId,
                     shortDescription: $shortDescription,
-                    readme: "Managed by moko-platform. Run `php cli/create_project.php` to regenerate."
+<<<<<<< HEAD
+                    readme: "Managed by MokoCLI. Run `php cli/create_project.php` to regenerate."
+=======
+                    readme: "Managed by mokoplatform. Run `php cli/create_project.php` to regenerate."
+>>>>>>> main
                 }) {
                     projectV2 { id }
                 }
             }',
             [
                 'projectId'        => $projectId,
-                'shortDescription' => "Standard project board for {$repo}. Auto-created by moko-platform.",
+<<<<<<< HEAD
+                'shortDescription' => "Standard project board for {$repo}. Auto-created by MokoCLI.",
+=======
+                'shortDescription' => "Standard project board for {$repo}. Auto-created by mokoplatform.",
+>>>>>>> main
             ],
             $token
         );

cli/create_repo.php

@@ -8,11 +8,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/create_repo.php
- * BRIEF: Scaffold a new governed repository with full moko-platform baseline
+ * BRIEF: Scaffold a new governed repository with full MokoCLI baseline
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/create_repo.php
+ * BRIEF: Scaffold a new governed repository with full mokoplatform baseline
+>>>>>>> main
  */
 
 declare(strict_types=1);
@@ -20,15 +28,19 @@ declare(strict_types=1);
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
-use MokoEnterprise\Config;
+use MokoCli\Config;
-use MokoEnterprise\PlatformAdapterFactory;
+use MokoCli\PlatformAdapterFactory;
 
 class CreateRepoCli extends CliFramework
 {
     protected function configure(): void
     {
-        $this->setDescription('Scaffold a new governed repository with full moko-platform baseline');
+<<<<<<< HEAD
+        $this->setDescription('Scaffold a new governed repository with full MokoCLI baseline');
+=======
+        $this->setDescription('Scaffold a new governed repository with full mokoplatform baseline');
+>>>>>>> main
         $this->addArgument('--name', 'Repository name', null);
         $this->addArgument('--type', 'Project type', null);
         $this->addArgument('--description', 'Repository description', '');
@@ -60,16 +72,29 @@ class CreateRepoCli extends CliFramework
             'generic' => 'generic',
         ];
         $TYPE_TO_TOPICS = [
-            'dolibarr' => ['dolibarr', 'erp', 'crm', 'php', 'moko-platform'],
+<<<<<<< HEAD
-            'joomla' => ['joomla', 'cms', 'php', 'moko-platform'],
+            'dolibarr' => ['dolibarr', 'erp', 'crm', 'php', 'MokoCLI'],
-            'nodejs' => ['nodejs', 'javascript', 'typescript', 'moko-platform'],
+            'joomla' => ['joomla', 'cms', 'php', 'MokoCLI'],
-            'terraform' => ['terraform', 'infrastructure', 'iac', 'moko-platform'],
+            'nodejs' => ['nodejs', 'javascript', 'typescript', 'MokoCLI'],
-            'python' => ['python', 'moko-platform'],
+            'terraform' => ['terraform', 'infrastructure', 'iac', 'MokoCLI'],
-            'wordpress' => ['wordpress', 'php', 'cms', 'moko-platform'],
+            'python' => ['python', 'MokoCLI'],
-            'generic' => ['moko-platform'],
+            'wordpress' => ['wordpress', 'php', 'cms', 'MokoCLI'],
+            'generic' => ['MokoCLI'],
         ];
         $platform = $TYPE_TO_PLATFORM[$type] ?? 'generic';
-        $topics = $TYPE_TO_TOPICS[$type] ?? ['moko-platform'];
+        $topics = $TYPE_TO_TOPICS[$type] ?? ['MokoCLI'];
+=======
+            'dolibarr' => ['dolibarr', 'erp', 'crm', 'php', 'mokoplatform'],
+            'joomla' => ['joomla', 'cms', 'php', 'mokoplatform'],
+            'nodejs' => ['nodejs', 'javascript', 'typescript', 'mokoplatform'],
+            'terraform' => ['terraform', 'infrastructure', 'iac', 'mokoplatform'],
+            'python' => ['python', 'mokoplatform'],
+            'wordpress' => ['wordpress', 'php', 'cms', 'mokoplatform'],
+            'generic' => ['mokoplatform'],
+        ];
+        $platform = $TYPE_TO_PLATFORM[$type] ?? 'generic';
+        $topics = $TYPE_TO_TOPICS[$type] ?? ['mokoplatform'];
+>>>>>>> main
         $platformName = $adapter->getPlatformName();
         $vis = $private ? 'private' : 'public';
         echo "Scaffolding new repository: {$org}/{$name}"
@@ -84,7 +109,11 @@ class CreateRepoCli extends CliFramework
         if (!$this->dryRun) {
             try {
                 $data = $adapter->createOrgRepo($org, $name, [
-                    'description' => $description ?: "Managed by moko-platform ({$type})",
+<<<<<<< HEAD
+                    'description' => $description ?: "Managed by MokoCLI ({$type})",
+=======
+                    'description' => $description ?: "Managed by mokoplatform ({$type})",
+>>>>>>> main
                     'private' => $private,
                     'has_issues' => true,
                     'has_projects' => true,
@@ -138,12 +167,16 @@ class CreateRepoCli extends CliFramework
         echo "Step 4: Creating README.md...\n";
         $baseUrl = $platformName === 'gitea' ? $config->getString('gitea.url', 'https://git.mokoconsulting.tech') : 'https://github.com';
         $repoUrl = "{$baseUrl}/{$org}/{$name}";
-        $standardsUrl = "{$baseUrl}/{$org}/MokoStandards";
+        $standardsUrl = "{$baseUrl}/{$org}/MokoCli";
         $readmeContent = "<!--\n"
             . "Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>\n"
             . "SPDX-License-Identifier: GPL-3.0-or-later\n"
             . "DEFGROUP: {$name}\n"
-            . "INGROUP: moko-platform\n"
+<<<<<<< HEAD
+            . "INGROUP: MokoCLI\n"
+=======
+            . "INGROUP: mokoplatform\n"
+>>>>>>> main
             . "REPO: {$repoUrl}\n"
             . "PATH: /README.md\n"
             . "BRIEF: {$description}\n"
@@ -152,7 +185,11 @@ class CreateRepoCli extends CliFramework
             . "{$description}\n\n"
             . "## Getting Started\n\n"
             . "This repository is governed by"
-            . " [moko-platform]({$standardsUrl}).\n\n"
+<<<<<<< HEAD
+            . " [MokoCLI]({$standardsUrl}).\n\n"
+=======
+            . " [mokoplatform]({$standardsUrl}).\n\n"
+>>>>>>> main
             . "## License\n\n"
             . "GPL-3.0-or-later. See [LICENSE](LICENSE)"
             . " for details.\n";
@@ -169,7 +206,11 @@ class CreateRepoCli extends CliFramework
                 $name,
                 'README.md',
                 $readmeContent,
-                'docs: initialize README with moko-platform header [skip ci]',
+<<<<<<< HEAD
+                'docs: initialize README with MokoCLI header [skip ci]',
+=======
+                'docs: initialize README with mokoplatform header [skip ci]',
+>>>>>>> main
                 $sha
             );
             echo "  README.md created\n";

cli/deploy_joomla.php

@@ -8,9 +8,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
+<<<<<<< HEAD
+ * DEFGROUP: MokoCLI.CLI
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
  * DEFGROUP: MokoPlatform.CLI
  * INGROUP: MokoPlatform
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/deploy_joomla.php
  * BRIEF: Smart Joomla deploy — routes files to correct server directories by extension type
  *
@@ -31,7 +37,7 @@ require_once __DIR__ . '/../vendor/autoload.php';
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\{CliFramework, SourceResolver};
 use phpseclib3\Net\SFTP;
 use phpseclib3\Crypt\PublicKeyLoader;
 
@@ -866,11 +872,11 @@ class DeployJoomla extends CliFramework
             }
         }
 
-        // 3-5. Fallback chain
+        // 3-5. Fallback chain (source/ → src/ → htdocs/)
-        foreach (['src', 'htdocs'] as $candidate) {
+        $resolved = SourceResolver::resolveAbsolute($repoPath);
-            if (is_dir("{$repoPath}/{$candidate}")) {
+        if ($resolved !== null) {
-                return "{$repoPath}/{$candidate}";
+            SourceResolver::warnIfLegacy($repoPath);
-            }
+            return $resolved;
         }
 
         // Last resort: repo root itself

cli/dev_branch_reset.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/dev_branch_reset.php
  * BRIEF: Delete and recreate dev branch from main via Gitea API
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class DevBranchResetCli extends CliFramework
 {

cli/grafana_dashboard.php

@@ -8,11 +8,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/grafana_dashboard.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/grafana_dashboard.php
+ * VERSION: 09.32.00
+>>>>>>> main
  * BRIEF: Manage Grafana dashboards via API
  */
 
@@ -20,7 +28,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class GrafanaDashboardCli extends CliFramework
 {

cli/joomla_build.php

@@ -6,11 +6,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/joomla_build.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/joomla_build.php
+ * VERSION: 09.32.00
+>>>>>>> main
  * BRIEF: Build a Joomla extension ZIP from manifest — all types supported
  * NOTE: Called by pre-release and auto-release workflows.
  */
@@ -19,7 +27,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\{CliFramework, SourceResolver};
 
 class JoomlaBuildCli extends CliFramework
 {
@@ -49,17 +57,12 @@ class JoomlaBuildCli extends CliFramework
         $path = realpath($path) ?: $path;
 
         // ── Find source directory ──────────────────────────────────────────────
-        $srcDir = null;
+        $srcDir = SourceResolver::resolveAbsolute($path);
-        foreach (['src', 'htdocs'] as $d) {
-            if (is_dir("{$path}/{$d}")) {
-                $srcDir = "{$path}/{$d}";
-                break;
-            }
-        }
         if ($srcDir === null) {
-            $this->log('ERROR', "::error::No src/ or htdocs/ directory in {$path}");
+            $this->log('ERROR', "::error::No source/ or src/ directory in {$path}");
             return 1;
         }
+        SourceResolver::warnIfLegacy($path);
 
         // ── Find manifest ──────────────────────────────────────────────────────
         $manifest = $this->findManifest($srcDir);

cli/joomla_compat_check.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/joomla_compat_check.php
  * BRIEF: Check if extension targetplatform regex matches the latest Joomla version
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class JoomlaCompatCheckCli extends CliFramework
 {

cli/joomla_metadata_validate.php

@@ -0,0 +1,550 @@
+#!/usr/bin/env php
+<?php
+
+/* Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * FILE INFORMATION
+<<<<<<< HEAD
+ * DEFGROUP: MokoCLI.CLI
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+ * PATH: /cli/joomla_metadata_validate.php
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/joomla_metadata_validate.php
+ * VERSION: 09.32.00
+>>>>>>> main
+ * BRIEF: Validate MokoGitea repo metadata against Joomla extension manifest XML
+ */
+
+declare(strict_types=1);
+
+require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
+
+<<<<<<< HEAD
+use MokoEnterprise\CliFramework;
+=======
+use MokoCli\CliFramework;
+>>>>>>> main
+
+class JoomlaMetadataValidateCli extends CliFramework
+{
+    /** Joomla element prefix map — must match MokoGitea's cleanJoomlaElement() */
+    private const JOOMLA_PREFIX = [
+        'package'   => 'pkg_',
+        'component' => 'com_',
+        'module'    => 'mod_',
+        'template'  => 'tpl_',
+        'library'   => 'lib_',
+        'file'      => 'file_',
+    ];
+
+    protected function configure(): void
+    {
+        $this->setDescription('Validate MokoGitea repo metadata against Joomla extension manifest XML');
+        $this->addArgument('--path', 'Repo root path (default: current directory)', '.');
+        $this->addArgument('--token', 'Gitea API token (or GITEA_TOKEN env)', '');
+        $this->addArgument('--org', 'Gitea org', 'MokoConsulting');
+        $this->addArgument('--repo', 'Repo name (auto-detected from git if empty)', '');
+        $this->addArgument('--api-base', 'Gitea API base URL', 'https://git.mokoconsulting.tech/api/v1');
+        $this->addArgument('--ci', 'CI mode: exit 1 on any error', false);
+        $this->addArgument('--json', 'Output as JSON', false);
+    }
+
+    protected function run(): int
+    {
+        $path     = realpath($this->getArgument('--path')) ?: $this->getArgument('--path');
+        $token    = $this->getArgument('--token') ?: getenv('GITEA_TOKEN') ?: '';
+        $org      = $this->getArgument('--org');
+        $repoName = $this->getArgument('--repo');
+        $apiBase  = rtrim($this->getArgument('--api-base'), '/');
+        $ciMode   = (bool) $this->getArgument('--ci');
+        $jsonMode = (bool) $this->getArgument('--json');
+
+        if (!is_dir($path)) {
+            $this->log('ERROR', "Path does not exist: {$path}");
+            return 1;
+        }
+
+        if ($repoName === '') {
+            $repoName = $this->detectRepoName($path);
+        }
+
+        // ── Step 1: Find the Joomla extension manifest XML ──────────
+        $joomlaXml = $this->findJoomlaManifest($path);
+
+        if ($joomlaXml === null) {
+            $this->log('ERROR', 'No Joomla extension manifest XML found');
+            return 1;
+        }
+
+        $this->log('INFO', "Joomla manifest: {$joomlaXml['path']}");
+
+        // ── Step 2: Load MokoGitea metadata ─────────────────────────
+        $metadata = $this->loadMetadata($path, $org, $repoName, $token, $apiBase);
+
+        if ($metadata === null) {
+            $this->log('ERROR', 'Could not load MokoGitea metadata');
+            return 1;
+        }
+
+        // ── Step 3: Compare ─────────────────────────────────────────
+        $results = $this->compare($metadata, $joomlaXml, $path);
+
+        // ── Step 4: Output ──────────────────────────────────────────
+        if ($jsonMode) {
+            echo json_encode([
+                'repo'    => $repoName,
+                'results' => $results,
+            ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n";
+        } else {
+            $this->printResults($repoName, $results);
+        }
+
+        $errors = count(array_filter($results, fn($r) => $r['status'] === 'error'));
+
+        return ($ciMode && $errors > 0) ? 1 : 0;
+    }
+
+    // =================================================================
+    // Find Joomla manifest XML
+    // =================================================================
+
+    private function findJoomlaManifest(string $root): ?array
+    {
+        // Search common locations for a Joomla extension manifest
+        $candidates = [];
+
+        // Package manifest: source/pkg_*.xml
+        foreach (glob("{$root}/source/pkg_*.xml") as $file) {
+            $candidates[] = $file;
+        }
+
+        // Component manifest: source/packages/com_*/[name].xml
+        foreach (glob("{$root}/source/packages/com_*/*.xml") as $file) {
+            $basename = basename($file);
+            // Skip access.xml, config.xml, etc.
+            if (in_array($basename, ['access.xml', 'config.xml'], true)) {
+                continue;
+            }
+            $candidates[] = $file;
+        }
+
+        // Direct source/*.xml
+        foreach (glob("{$root}/source/*.xml") as $file) {
+            if (basename($file) !== 'pkg_mokosuitebackup.xml') {
+                // Already caught above
+            }
+            $candidates[] = $file;
+        }
+
+        // src/ fallback
+        foreach (glob("{$root}/src/pkg_*.xml") as $file) {
+            $candidates[] = $file;
+        }
+
+        // Find the first one that has <extension type="...">
+        foreach (array_unique($candidates) as $file) {
+            $content = file_get_contents($file);
+            if ($content === false) {
+                continue;
+            }
+
+            if (preg_match('/<extension\s[^>]*type=["\']([^"\']+)["\']/', $content, $typeMatch)) {
+                $xml = @simplexml_load_string($content);
+                if ($xml === false) {
+<<<<<<< HEAD
+=======
+                    $relPath = str_replace($root . '/', '', $file);
+                    $relPath = str_replace($root . '\\', '', $relPath);
+                    $this->log('WARN', "Skipping {$relPath}: malformed XML");
+>>>>>>> main
+                    continue;
+                }
+
+                $type = strtolower($typeMatch[1]);
+                $relPath = str_replace($root . '/', '', $file);
+                $relPath = str_replace($root . '\\', '', $relPath);
+
+                return [
+                    'path' => $relPath,
+                    'type' => $type,
+                    'xml'  => $xml,
+                ];
+            }
+        }
+
+        return null;
+    }
+
+    // =================================================================
+    // Load metadata (from API)
+    // =================================================================
+
+    private function loadMetadata(string $root, string $org, string $repoName, string $token, string $apiBase): ?array
+    {
+<<<<<<< HEAD
+        if ($token !== '') {
+            $url = "{$apiBase}/repos/{$org}/{$repoName}/metadata";
+            $ctx = stream_context_create([
+                'http' => [
+                    'header'  => "Authorization: token {$token}\r\nAccept: application/json\r\n",
+                    'timeout' => 10,
+                ],
+            ]);
+
+            $body = @file_get_contents($url, false, $ctx);
+
+            if ($body !== false) {
+                $data = json_decode($body, true);
+                if (is_array($data)) {
+                    $data['source'] = 'api';
+                    return $data;
+                }
+            }
+        }
+
+        return null;
+=======
+        if ($token === '') {
+            $this->log('ERROR', 'No API token provided (use --token or set GITEA_TOKEN env var)');
+            return null;
+        }
+
+        $url = "{$apiBase}/repos/{$org}/{$repoName}/metadata";
+        $ctx = stream_context_create([
+            'http' => [
+                'header'        => "Authorization: token {$token}\r\nAccept: application/json\r\n",
+                'timeout'       => 10,
+                'ignore_errors' => true,
+            ],
+        ]);
+
+        $body = file_get_contents($url, false, $ctx);
+
+        // Extract HTTP status from response headers
+        $httpCode = 0;
+        if (isset($http_response_header[0]) && preg_match('/\d{3}/', $http_response_header[0], $m)) {
+            $httpCode = (int) $m[0];
+        }
+
+        if ($body === false) {
+            $this->log('ERROR', "Failed to connect to {$url} — check network or TLS configuration");
+            return null;
+        }
+
+        if ($httpCode === 404) {
+            $this->log('ERROR', "API endpoint not found: {$url}");
+            $this->log('ERROR', 'Server may need MokoGitea-Fork >= #650 (metadata endpoint rename)');
+            return null;
+        }
+
+        if ($httpCode === 401 || $httpCode === 403) {
+            $this->log('ERROR', "Authentication failed (HTTP {$httpCode}) — check your API token");
+            return null;
+        }
+
+        if ($httpCode >= 400) {
+            $this->log('ERROR', "API returned HTTP {$httpCode}: " . substr($body, 0, 200));
+            return null;
+        }
+
+        $data = json_decode($body, true);
+        if (!is_array($data)) {
+            $this->log('ERROR', "API returned invalid JSON from {$url}");
+            return null;
+        }
+
+        $data['source'] = 'api';
+        return $data;
+>>>>>>> main
+    }
+
+    // =================================================================
+    // Compare metadata against Joomla manifest
+    // =================================================================
+
+    private function compare(array $metadata, array $joomlaXml, string $root): array
+    {
+        $results = [];
+        $xml     = $joomlaXml['xml'];
+        $type    = $joomlaXml['type'];
+
+        // 1. Extension type
+<<<<<<< HEAD
+        $metaType = $this->normalizeExtensionType($metadata['extension_type'] ?? '');
+=======
+        $metaType = $this->normalizeExtensionType(
+            $metadata['extension_type'] ?? $metadata['package_type'] ?? ''
+        );
+>>>>>>> main
+        $results[] = [
+            'field'    => 'extension_type',
+            'metadata' => $metaType,
+            'joomla'   => $type,
+            'status'   => ($metaType === $type) ? 'ok' : 'error',
+            'message'  => ($metaType === $type)
+                ? "matches <extension type=\"{$type}\">"
+                : "metadata has \"{$metaType}\" but Joomla manifest has \"{$type}\"",
+        ];
+
+        // 2. Element name
+        $metaName    = strtolower($metadata['name'] ?? '');
+        $metaElement = $this->deriveElement($metaType, $metaName);
+        $joomlaElement = $this->extractJoomlaElement($xml, $type);
+
+        $elementMatch = ($metaElement === $joomlaElement);
+        $results[] = [
+            'field'    => 'element',
+            'metadata' => $metaElement,
+            'joomla'   => $joomlaElement,
+            'status'   => $elementMatch ? 'ok' : 'error',
+            'message'  => $elementMatch
+                ? "derived correctly"
+                : "metadata derives \"{$metaElement}\" but Joomla uses \"{$joomlaElement}\"",
+        ];
+
+        // 3. Version
+        $metaVersion  = $metadata['version'] ?? '';
+        $joomlaVersion = (string) ($xml->version ?? '');
+
+        if ($metaVersion !== '' && $joomlaVersion !== '') {
+            // Strip dev/rc suffixes for comparison (CI bumps these)
+            $metaBase   = preg_replace('/-(dev|rc|alpha|beta)\d*$/', '', $metaVersion);
+            $joomlaBase = preg_replace('/-(dev|rc|alpha|beta)\d*$/', '', $joomlaVersion);
+            $versionMatch = ($metaBase === $joomlaBase);
+
+            $results[] = [
+                'field'    => 'version',
+                'metadata' => $metaVersion,
+                'joomla'   => $joomlaVersion,
+                'status'   => $versionMatch ? 'ok' : 'warn',
+                'message'  => $versionMatch
+                    ? 'matches (base version)'
+                    : "metadata has \"{$metaVersion}\" but Joomla has \"{$joomlaVersion}\"",
+            ];
+        }
+
+        // 4. PHP minimum (from composer.json)
+        $composerPhp = $this->readComposerPhpRequirement($root);
+        $metaPhp     = $metadata['php_minimum'] ?? '';
+
+        if ($composerPhp !== '' && $metaPhp !== '') {
+            $phpMatch = ($metaPhp === $composerPhp);
+            $results[] = [
+                'field'    => 'php_minimum',
+                'metadata' => $metaPhp,
+                'joomla'   => $composerPhp . ' (composer.json)',
+                'status'   => $phpMatch ? 'ok' : 'warn',
+                'message'  => $phpMatch
+                    ? 'matches composer.json'
+                    : "metadata has \"{$metaPhp}\" but composer.json requires \"{$composerPhp}\"",
+            ];
+        }
+
+        // 5. Description
+        $metaDesc   = $metadata['description'] ?? '';
+        $joomlaDesc = (string) ($xml->description ?? '');
+
+        // Joomla descriptions are often language keys, skip those
+        if ($metaDesc !== '' && $joomlaDesc !== '' && !str_starts_with($joomlaDesc, 'COM_') && !str_starts_with($joomlaDesc, 'PKG_')) {
+            $descMatch = ($metaDesc === $joomlaDesc);
+            $results[] = [
+                'field'    => 'description',
+                'metadata' => substr($metaDesc, 0, 60) . (strlen($metaDesc) > 60 ? '...' : ''),
+                'joomla'   => substr($joomlaDesc, 0, 60) . (strlen($joomlaDesc) > 60 ? '...' : ''),
+                'status'   => $descMatch ? 'ok' : 'info',
+                'message'  => $descMatch ? 'matches' : 'descriptions differ (informational)',
+            ];
+        }
+
+        return $results;
+    }
+
+    // =================================================================
+    // Helpers
+    // =================================================================
+
+    /**
+     * Normalize extension_type — map MokoGitea types to Joomla types.
+     */
+    private function normalizeExtensionType(string $type): string
+    {
+        return match (strtolower($type)) {
+            'joomla-extension' => 'package', // legacy mapping
+            default => strtolower($type),
+        };
+    }
+
+    /**
+     * Derive the Joomla element name from type + name.
+     * Replicates MokoGitea's cleanJoomlaElement() + prefix logic.
+     */
+    private function deriveElement(string $type, string $name): string
+    {
+        // Clean: lowercase, strip non-alphanumeric except . _ -
+        $clean = strtolower($name);
+        $clean = preg_replace('/[^a-z0-9._-]/', '', $clean);
+
+        $prefix = self::JOOMLA_PREFIX[$type] ?? '';
+
+        return $prefix . $clean;
+    }
+
+    /**
+     * Extract the element name from a Joomla manifest XML.
+     * Follows the same logic as Joomla's InstallerAdapter::getElement().
+     */
+    private function extractJoomlaElement(\SimpleXMLElement $xml, string $type): string
+    {
+        switch ($type) {
+            case 'package':
+                $packagename = (string) ($xml->packagename ?? '');
+                if ($packagename !== '') {
+                    return 'pkg_' . strtolower(preg_replace('/[^a-zA-Z0-9._-]/', '', $packagename));
+                }
+                break;
+
+            case 'component':
+                $element = (string) ($xml->element ?? '');
+                if ($element !== '') {
+                    $element = strtolower($element);
+                    return str_starts_with($element, 'com_') ? $element : 'com_' . $element;
+                }
+                $name = (string) ($xml->name ?? '');
+                $name = strtolower(preg_replace('/[^a-zA-Z0-9._-]/', '', $name));
+                return str_starts_with($name, 'com_') ? $name : 'com_' . $name;
+
+            case 'module':
+                $element = (string) ($xml->element ?? '');
+                if ($element !== '') {
+                    return strtolower($element);
+                }
+                break;
+
+            case 'plugin':
+                // Plugins derive element from the file attribute
+                if (isset($xml->files)) {
+                    foreach ($xml->files->children() as $file) {
+                        $plugin = (string) ($file->attributes()->plugin ?? '');
+                        if ($plugin !== '') {
+                            return strtolower($plugin);
+                        }
+                    }
+                }
+                break;
+
+            case 'library':
+                $libname = (string) ($xml->libraryname ?? '');
+                if ($libname !== '') {
+                    return strtolower($libname);
+                }
+                break;
+        }
+
+        // Fallback: use <name> tag
+        $name = (string) ($xml->name ?? '');
+        return strtolower(preg_replace('/[^a-zA-Z0-9._-]/', '', $name));
+    }
+
+    /**
+     * Read PHP version requirement from composer.json.
+     */
+    private function readComposerPhpRequirement(string $root): string
+    {
+        $composerFile = "{$root}/composer.json";
+
+        if (!is_file($composerFile)) {
+            return '';
+        }
+
+        $data = json_decode(file_get_contents($composerFile), true);
+
+        if (!is_array($data)) {
+            return '';
+        }
+
+        $phpReq = $data['require']['php'] ?? '';
+
+        // Extract version number from constraint like ">=8.1"
+        if (preg_match('/(\d+\.\d+)/', $phpReq, $m)) {
+            return $m[1];
+        }
+
+        return '';
+    }
+
+    private function detectRepoName(string $root): string
+    {
+        $gitConfig = "{$root}/.git/config";
+
+        if (!file_exists($gitConfig)) {
+            return basename($root);
+        }
+
+        $content = file_get_contents($gitConfig);
+
+        if (preg_match('/url\s*=\s*.*\/([^\/\s]+?)(?:\.git)?\s*$/m', $content, $m)) {
+            return $m[1];
+        }
+
+        return basename($root);
+    }
+
+    // =================================================================
+    // Output
+    // =================================================================
+
+    private function printResults(string $repoName, array $results): void
+    {
+        $errors = count(array_filter($results, fn($r) => $r['status'] === 'error'));
+        $warns  = count(array_filter($results, fn($r) => $r['status'] === 'warn'));
+        $oks    = count(array_filter($results, fn($r) => $r['status'] === 'ok'));
+
+        $this->log('INFO', "Validating {$repoName} Joomla metadata...\n");
+
+        foreach ($results as $r) {
+            $icon = match ($r['status']) {
+                'ok'    => "\xE2\x9C\x93", // ✓
+                'error' => "\xE2\x9C\x97", // ✗
+                'warn'  => "\xE2\x9A\xA0", // ⚠
+                default => "\xE2\x84\xB9", // ℹ
+            };
+
+            $line = sprintf(
+                "  %s %-16s %s",
+                $icon,
+                $r['field'],
+                $r['message']
+            );
+
+            $this->log(
+                match ($r['status']) {
+                    'error' => 'ERROR',
+                    'warn'  => 'WARN',
+                    'ok'    => 'OK',
+                    default => 'INFO',
+                },
+                $line
+            );
+        }
+
+        echo "\n";
+
+        if ($errors > 0) {
+            $this->log('ERROR', "{$errors} error(s) — update delivery will fail");
+        } elseif ($warns > 0) {
+            $this->log('WARN', "All critical checks passed, {$warns} warning(s)");
+        } else {
+            $this->log('OK', "All {$oks} checks passed");
+        }
+    }
+}
+
+$app = new JoomlaMetadataValidateCli();
+exit($app->execute());

cli/joomla_release.php

@@ -8,9 +8,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/joomla_release.php
  * BRIEF: Joomla release pipeline — build ZIP+tar.gz, upload to GitHub Release, update updates.xml
  *
@@ -25,7 +31,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-use MokoEnterprise\{ApiClient, AuditLogger, CliFramework, Config, PlatformAdapterFactory};
+use MokoCli\{ApiClient, AuditLogger, CliFramework, Config, PlatformAdapterFactory, SourceResolver};
 
 /**
  * Joomla Release Manager
@@ -57,7 +63,7 @@ class JoomlaRelease extends CliFramework
     ];
 
     private ApiClient $api;
-    private \MokoEnterprise\GitPlatformAdapter $adapter;
+    private \MokoCli\GitPlatformAdapter $adapter;
 
     protected function configure(): void
     {
@@ -121,11 +127,12 @@ class JoomlaRelease extends CliFramework
         $this->log('INFO', "Version: {$displayVersion}  |  Release tag: {$releaseTag}");
 
         // ── Step 3: Build packages ────────────────────────────────────
-        $srcDir = is_dir("{$path}/src") ? "{$path}/src" : (is_dir("{$path}/htdocs") ? "{$path}/htdocs" : null);
+        $srcDir = SourceResolver::resolveAbsolute($path);
         if ($srcDir === null) {
-            $this->log('ERROR', 'No src/ or htdocs/ directory');
+            $this->log('ERROR', 'No source/ or src/ directory');
             return 1;
         }
+        SourceResolver::warnIfLegacy($path);
 
         $prefix  = $this->typePrefix($meta);
         $zipName = "{$prefix}{$meta['element']}-{$displayVersion}.zip";
@@ -406,7 +413,11 @@ class JoomlaRelease extends CliFramework
             $this->api->post("/repos/{$repo}/releases", [
                 'tag_name'   => $tag,
                 'name'       => $releaseName,
-                'body'       => "## {$version}\n\nCreated by moko-platform release pipeline.",
+<<<<<<< HEAD
+                'body'       => "## {$version}\n\nCreated by MokoCLI release pipeline.",
+=======
+                'body'       => "## {$version}\n\nCreated by mokoplatform release pipeline.",
+>>>>>>> main
                 'prerelease' => ($stability !== 'stable'),
             ]);
         }

cli/license_manage.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/license_manage.php
  * BRIEF: Manage license packages and keys via MokoGitea licensing API
  *
@@ -28,7 +34,7 @@ declare(strict_types=1);
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class LicenseManage extends CliFramework
 {

cli/manifest_detect.php

@@ -0,0 +1,749 @@
+#!/usr/bin/env php
+<?php
+
+/* Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * FILE INFORMATION
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/manifest_detect.php
+ * VERSION: 09.32.00
+ * BRIEF: Auto-detect manifest fields from source files and optionally push to API
+ */
+
+declare(strict_types=1);
+
+require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
+
+use MokoCli\{CliFramework, SourceResolver};
+
+class ManifestDetectCli extends CliFramework
+{
+    protected function configure(): void
+    {
+        $this->setDescription('Auto-detect manifest fields from source files');
+        $this->addArgument('--path', 'Repository root path', '.');
+        $this->addArgument('--json', 'Output as JSON', false);
+        $this->addArgument('--diff', 'Show diff against current manifest API values', false);
+        $this->addArgument('--update', 'Push detected fields to manifest API', false);
+        $this->addArgument('--token', 'Gitea API token (or GITEA_TOKEN env)', '');
+        $this->addArgument('--api-base', 'Gitea API base URL', 'https://git.mokoconsulting.tech/api/v1');
+        $this->addArgument('--org', 'Gitea org', 'MokoConsulting');
+        $this->addArgument('--repo', 'Gitea repo name (auto-detected from remote if empty)', '');
+        $this->addArgument('--github-output', 'Append fields to $GITHUB_OUTPUT', false);
+    }
+
+    protected function run(): int
+    {
+        $path       = $this->getArgument('--path');
+        $jsonMode   = (bool) $this->getArgument('--json');
+        $diffMode   = (bool) $this->getArgument('--diff');
+        $updateMode = (bool) $this->getArgument('--update');
+        $ghOutput   = (bool) $this->getArgument('--github-output');
+        $token      = $this->getArgument('--token') ?: getenv('GITEA_TOKEN') ?: '';
+        $apiBase    = rtrim($this->getArgument('--api-base'), '/');
+        $org        = $this->getArgument('--org');
+        $repoName   = $this->getArgument('--repo');
+
+        $root = realpath($path) ?: $path;
+
+        if (!is_dir($root)) {
+            $this->log('ERROR', "Path does not exist: {$path}");
+            return 1;
+        }
+
+        // Auto-detect repo name from git remote
+        if ($repoName === '') {
+            $repoName = $this->detectRepoName($root);
+        }
+
+        // ── Detect all fields ───────────────────────────────────────
+        $detected = $this->detectAll($root, $repoName);
+
+        // ── Warn about missing fields ────────────────────────────────
+        $expected = ['platform', 'name', 'version', 'package_type', 'language', 'entry_point'];
+        foreach ($expected as $field) {
+            if (!isset($detected[$field]) || $detected[$field] === '') {
+                $this->log('WARN', "Could not detect: {$field}");
+            }
+        }
+
+        // ── Output ──────────────────────────────────────────────────
+        if ($diffMode || $updateMode) {
+            if ($token === '') {
+                $this->log('ERROR', 'API token required for --diff/--update (use --token or GITEA_TOKEN env)');
+                return 1;
+            }
+            if ($repoName === '') {
+                $this->log('ERROR', 'Could not determine repo name (use --repo)');
+                return 1;
+            }
+
+            $current = $this->fetchManifest($apiBase, $org, $repoName, $token);
+            if ($current === null) {
+                $this->log('ERROR', 'Failed to fetch current manifest from API');
+                return 1;
+            }
+
+            $changes = $this->computeDiff($current, $detected);
+
+            if ($diffMode) {
+                if (empty($changes)) {
+                    $this->log('INFO', 'No differences — manifest matches source');
+                } else {
+                    $this->sectionHeader('Manifest Drift');
+                    foreach ($changes as $field => $info) {
+                        $this->log('WARN', sprintf(
+                            '%-20s  API: %-30s  Detected: %s',
+                            $field,
+                            $info['current'] === '' ? '(empty)' : $info['current'],
+                            $info['detected']
+                        ));
+                    }
+                }
+            }
+
+            if ($updateMode) {
+                if (empty($changes)) {
+                    $this->log('INFO', 'Nothing to update');
+                } else {
+                    $update = array_map(fn($i) => $i['detected'], $changes);
+                    $ok = $this->pushManifest($apiBase, $org, $repoName, $token, $current, $update);
+                    if ($ok) {
+                        $this->log('OK', 'Updated ' . count($update) . ' field(s): ' . implode(', ', array_keys($update)));
+                    } else {
+                        $this->log('ERROR', 'Failed to push manifest update');
+                        return 1;
+                    }
+                }
+            }
+
+            return 0;
+        }
+
+        if ($ghOutput) {
+            $outputFile = getenv('GITHUB_OUTPUT');
+            $lines = [];
+            foreach ($detected as $k => $v) {
+                $envKey = str_replace('-', '_', $k);
+                $lines[] = "{$envKey}={$v}";
+            }
+            if ($outputFile !== false && $outputFile !== '') {
+                file_put_contents($outputFile, implode("\n", $lines) . "\n", FILE_APPEND);
+                $this->log('INFO', 'Wrote ' . count($detected) . ' fields to GITHUB_OUTPUT');
+            } else {
+                $this->log('WARN', 'GITHUB_OUTPUT not set — printing to stdout instead');
+                echo implode("\n", $lines) . "\n";
+            }
+            return 0;
+        }
+
+        if ($jsonMode) {
+            echo json_encode($detected, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n";
+        } else {
+            foreach ($detected as $k => $v) {
+                echo "{$k}={$v}\n";
+            }
+        }
+
+        return 0;
+    }
+
+    // =====================================================================
+    // Detection engine
+    // =====================================================================
+
+    private function detectAll(string $root, string $repoName): array
+    {
+        $platform = $this->detectPlatform($root);
+
+        $fields = [
+            'platform'       => $platform,
+            'name'           => '',
+            'description'    => '',
+            'version'        => '',
+            'element_name'   => '',
+            'package_type'   => '',
+            'language'       => '',
+            'entry_point'    => '',
+            'license_spdx'   => '',
+            'display_name'   => '',
+            'target_version' => '',
+            'php_minimum'    => '',
+        ];
+
+        switch ($platform) {
+            case 'joomla':
+                $this->detectJoomla($root, $repoName, $fields);
+                break;
+            case 'dolibarr':
+                $this->detectDolibarr($root, $repoName, $fields);
+                break;
+            case 'go':
+                $this->detectGo($root, $repoName, $fields);
+                break;
+            case 'mcp':
+                $this->detectNode($root, $repoName, $fields);
+                break;
+            case 'node':
+                $this->detectNode($root, $repoName, $fields);
+                $fields['platform'] = 'node';
+                break;
+            default:
+                $this->detectGeneric($root, $repoName, $fields);
+                break;
+        }
+
+        // Fallbacks
+        if ($fields['name'] === '') {
+            $fields['name'] = $repoName ?: basename($root);
+        }
+        if ($fields['entry_point'] === '') {
+            $fields['entry_point'] = $this->detectEntryPoint($root);
+        }
+        if ($fields['license_spdx'] === '') {
+            $fields['license_spdx'] = $this->detectLicense($root);
+        }
+        // description: only from platform-specific source, never guessed
+
+        // Strip empty values
+        return array_filter($fields, fn($v) => $v !== '');
+    }
+
+    // ── Platform detection ──────────────────────────────────────────
+
+    private function detectPlatform(string $root): string
+    {
+        // Joomla: look for pkg_*.xml or extension XML in source dirs
+        $joomlaXmls = array_merge(
+            SourceResolver::globSource($root, 'pkg_*.xml'),
+            glob("{$root}/pkg_*.xml") ?: []
+        );
+        if (!empty($joomlaXmls)) {
+            return 'joomla';
+        }
+
+        // Check source dirs for any Joomla extension XML
+        foreach (SourceResolver::globSource($root, '*.xml') as $xmlFile) {
+            $content = file_get_contents($xmlFile);
+            if (strpos($content, '<extension') !== false) {
+                return 'joomla';
+            }
+        }
+
+        // Dolibarr: mod*.class.php with DolibarrModules
+        $modFiles = array_merge(
+            SourceResolver::globSource($root, 'core/modules/mod*.class.php'),
+            glob("{$root}/core/modules/mod*.class.php") ?: []
+        );
+        foreach ($modFiles as $file) {
+            if (strpos(file_get_contents($file), 'DolibarrModules') !== false) {
+                return 'dolibarr';
+            }
+        }
+
+        // Go
+        if (file_exists("{$root}/go.mod")) {
+            return 'go';
+        }
+
+        // MCP: package.json with mcp-related content
+        if (file_exists("{$root}/package.json")) {
+            $pkg = json_decode(file_get_contents("{$root}/package.json"), true) ?? [];
+            $deps = array_merge(
+                array_keys($pkg['dependencies'] ?? []),
+                array_keys($pkg['devDependencies'] ?? [])
+            );
+            foreach ($deps as $dep) {
+                if (strpos($dep, '@modelcontextprotocol/') === 0 || $dep === '@anthropic/mcp-sdk') {
+                    return 'mcp';
+                }
+            }
+            return 'node';
+        }
+
+        // Python
+        if (file_exists("{$root}/pyproject.toml") || file_exists("{$root}/setup.py")) {
+            return 'python';
+        }
+
+        return 'generic';
+    }
+
+    // ── Joomla ──────────────────────────────────────────────────────
+
+    private function detectJoomla(string $root, string $repoName, array &$fields): void
+    {
+        $fields['language'] = 'PHP';
+
+        // Find the primary extension manifest XML
+        $extManifest = $this->findJoomlaManifest($root);
+        if ($extManifest === null) {
+            return;
+        }
+
+        $xml = file_get_contents($extManifest);
+
+        // Type
+        $extType = '';
+        if (preg_match('/type="([^"]*)"/', $xml, $m)) {
+            $extType = $m[1];
+        }
+        $fields['package_type'] = $extType;
+
+        // Element name
+        $element = '';
+        if (preg_match('/<element>([^<]+)<\/element>/', $xml, $m)) {
+            $element = $m[1];
+        }
+        if ($element === '' && preg_match('/module="([^"]*)"/', $xml, $m)) {
+            $element = $m[1];
+        }
+        if ($element === '' && preg_match('/plugin="([^"]*)"/', $xml, $m)) {
+            $element = $m[1];
+        }
+        if ($extType === 'package' && preg_match('/<packagename>([^<]+)<\/packagename>/', $xml, $m)) {
+            $element = $m[1];
+        }
+        if ($element === '') {
+            $element = strtolower(basename($extManifest, '.xml'));
+        }
+
+        // Ensure element has type prefix (API stores full element_name like pkg_mokosuite)
+        $prefixMap = [
+            'package' => 'pkg_', 'component' => 'com_', 'module' => 'mod_',
+            'template' => 'tpl_', 'library' => 'lib_', 'file' => 'file_',
+        ];
+        if (isset($prefixMap[$extType])) {
+            $prefix = $prefixMap[$extType];
+            // Only add prefix if not already present (check all known prefixes)
+            $hasPrefix = false;
+            foreach ($prefixMap as $p) {
+                if (strpos($element, $p) === 0) { $hasPrefix = true; break; }
+            }
+            if (strpos($element, 'plg_') === 0) { $hasPrefix = true; }
+            if (!$hasPrefix) {
+                $element = $prefix . $element;
+            }
+        } elseif ($extType === 'plugin') {
+            $folder = '';
+            if (preg_match('/group="([^"]*)"/', $xml, $gm)) {
+                $folder = $gm[1];
+            }
+            if ($folder !== '' && strpos($element, 'plg_') !== 0) {
+                $element = "plg_{$folder}_" . $element;
+            }
+        }
+        $fields['element_name'] = $element;
+
+        // Name
+        if (preg_match('/<name>([^<]+)<\/name>/', $xml, $m)) {
+            $fields['name'] = trim($m[1]);
+        }
+
+        // Version
+        if (preg_match('/<version>([^<]+)<\/version>/', $xml, $m)) {
+            $fields['version'] = trim($m[1]);
+        }
+
+        // Description
+        if (preg_match('/<description>([^<]+)<\/description>/', $xml, $m)) {
+            $desc = trim($m[1]);
+            // Skip language string keys like COM_MOKOSUITE_DESCRIPTION
+            if (strpos($desc, '_') === false || strlen($desc) > 60) {
+                $fields['description'] = $desc;
+            }
+        }
+
+        // Display name for update feeds
+        if (!empty($fields['name'])) {
+            $name = $fields['name'];
+            // If name already has "Type - " prefix, use as-is
+            if (preg_match('/^(Package|Component|Module|Plugin|Template|Library)\s*-\s*/i', $name)) {
+                $fields['display_name'] = $name;
+            } elseif (!empty($extType)) {
+                $fields['display_name'] = ucfirst($extType) . ' - ' . $name;
+            }
+        }
+
+        // Target Joomla version
+        if (preg_match('/<targetplatform\s[^>]*version="([^"]+)"/', $xml, $m)) {
+            $fields['target_version'] = trim($m[1]);
+        } else {
+            // Default for Joomla 5/6
+            $fields['target_version'] = '(5|6)\..*';
+        }
+
+        // PHP minimum
+        if (preg_match('/<php_minimum>([^<]+)<\/php_minimum>/', $xml, $m)) {
+            $fields['php_minimum'] = trim($m[1]);
+        }
+
+        // License
+        if (preg_match('/<license>([^<]+)<\/license>/', $xml, $m)) {
+            $fields['license_spdx'] = $this->normalizeLicense(trim($m[1]));
+        }
+    }
+
+    private function findJoomlaManifest(string $root): ?string
+    {
+        // Priority: pkg_*.xml (package manifest)
+        $pkgXmls = array_merge(
+            SourceResolver::globSource($root, 'pkg_*.xml'),
+            glob("{$root}/pkg_*.xml") ?: []
+        );
+        if (!empty($pkgXmls)) {
+            return $pkgXmls[0];
+        }
+
+        // Any extension XML in source dir
+        foreach (SourceResolver::globSource($root, '*.xml') as $file) {
+            $content = file_get_contents($file);
+            if (strpos($content, '<extension') !== false) {
+                return $file;
+            }
+        }
+
+        // Root level
+        foreach (glob("{$root}/*.xml") ?: [] as $file) {
+            $content = file_get_contents($file);
+            if (strpos($content, '<extension') !== false) {
+                return $file;
+            }
+        }
+
+        return null;
+    }
+
+    // ── Dolibarr ────────────────────────────────────────────────────
+
+    private function detectDolibarr(string $root, string $repoName, array &$fields): void
+    {
+        $fields['language'] = 'PHP';
+        $fields['package_type'] = 'dolibarr-module';
+
+        $modFile = $this->findDolibarrModule($root);
+        if ($modFile === null) {
+            return;
+        }
+
+        $content = file_get_contents($modFile);
+
+        // Element name from class file
+        $modBasename = basename($modFile, '.class.php');
+        $fields['element_name'] = strtolower(preg_replace('/^mod/', '', $modBasename));
+
+        // Name
+        if (preg_match('/\$this->name\s*=\s*[\'"]([^\'"]+)[\'"]/', $content, $m)) {
+            $fields['name'] = $m[1];
+        }
+
+        // Version
+        if (preg_match('/\$this->version\s*=\s*[\'"]([^\'"]+)[\'"]/', $content, $m)) {
+            $fields['version'] = $m[1];
+        }
+
+        // Description
+        if (preg_match('/\$this->description\s*=\s*[\'"]([^\'"]+)[\'"]/', $content, $m)) {
+            $desc = $m[1];
+            if (strpos($desc, '$') === false) {
+                $fields['description'] = $desc;
+            }
+        }
+
+        // License
+        if (preg_match('/SPDX-License-Identifier:\s*(\S+)/', $content, $m)) {
+            $fields['license_spdx'] = $m[1];
+        }
+    }
+
+    private function findDolibarrModule(string $root): ?string
+    {
+        $candidates = array_merge(
+            SourceResolver::globSource($root, 'core/modules/mod*.class.php'),
+            glob("{$root}/core/modules/mod*.class.php") ?: []
+        );
+        foreach ($candidates as $file) {
+            if (strpos(file_get_contents($file), 'DolibarrModules') !== false) {
+                return $file;
+            }
+        }
+        return null;
+    }
+
+    // ── Go ──────────────────────────────────────────────────────────
+
+    private function detectGo(string $root, string $repoName, array &$fields): void
+    {
+        $fields['language'] = 'Go';
+        $fields['package_type'] = 'application';
+        $fields['entry_point'] = './';
+
+        $goMod = "{$root}/go.mod";
+        if (!file_exists($goMod)) {
+            return;
+        }
+
+        $content = file_get_contents($goMod);
+
+        // Module path → name
+        if (preg_match('/^module\s+(\S+)/m', $content, $m)) {
+            $modulePath = $m[1];
+            $parts = explode('/', $modulePath);
+            $fields['name'] = end($parts);
+        }
+
+        // Go version
+        if (preg_match('/^go\s+(\S+)/m', $content, $m)) {
+            // This is Go language version, not the project version
+            // Project version comes from git tags or source files
+        }
+
+        // License
+        $fields['license_spdx'] = $this->detectLicense($root);
+    }
+
+    // ── Node / MCP ──────────────────────────────────────────────────
+
+    private function detectNode(string $root, string $repoName, array &$fields): void
+    {
+        $pkgFile = "{$root}/package.json";
+        if (!file_exists($pkgFile)) {
+            return;
+        }
+
+        $pkg = json_decode(file_get_contents($pkgFile), true) ?? [];
+
+        $fields['name'] = $pkg['name'] ?? '';
+        // Strip npm scope
+        if (strpos($fields['name'], '/') !== false) {
+            $fields['name'] = explode('/', $fields['name'])[1];
+        }
+
+        $fields['version'] = $pkg['version'] ?? '';
+        $fields['description'] = $pkg['description'] ?? '';
+        $fields['license_spdx'] = $pkg['license'] ?? '';
+
+        // Language detection
+        if (file_exists("{$root}/tsconfig.json")) {
+            $fields['language'] = 'TypeScript';
+        } else {
+            $fields['language'] = 'JavaScript';
+        }
+
+        // Package type
+        $deps = array_merge(
+            array_keys($pkg['dependencies'] ?? []),
+            array_keys($pkg['devDependencies'] ?? [])
+        );
+        $isMcp = false;
+        foreach ($deps as $dep) {
+            if (strpos($dep, '@modelcontextprotocol/') === 0 || $dep === '@anthropic/mcp-sdk') {
+                $isMcp = true;
+                break;
+            }
+        }
+        $fields['package_type'] = $isMcp ? 'mcp-server' : 'application';
+
+        // Entry point
+        if (file_exists("{$root}/dist")) {
+            $fields['entry_point'] = 'dist/';
+        } elseif (file_exists("{$root}/src")) {
+            $fields['entry_point'] = 'src/';
+        } else {
+            $fields['entry_point'] = './';
+        }
+    }
+
+    // ── Generic ─────────────────────────────────────────────────────
+
+    private function detectGeneric(string $root, string $repoName, array &$fields): void
+    {
+        $fields['package_type'] = 'generic';
+
+        // Try to detect language from file extensions
+        $fields['language'] = $this->detectLanguageFromFiles($root);
+        $fields['license_spdx'] = $this->detectLicense($root);
+    }
+
+    // =====================================================================
+    // Shared detection helpers
+    // =====================================================================
+
+    private function detectEntryPoint(string $root): string
+    {
+        $abs = SourceResolver::resolveAbsolute($root);
+        if ($abs !== null) {
+            return basename($abs) . '/';
+        }
+        if (is_dir("{$root}/dist")) return 'dist/';
+        if (is_dir("{$root}/src")) return 'src/';
+        return './';
+    }
+
+    private function detectLicense(string $root): string
+    {
+        // Check LICENSE file
+        foreach (['LICENSE', 'LICENSE.md', 'LICENSE.txt', 'COPYING'] as $name) {
+            $file = "{$root}/{$name}";
+            if (!file_exists($file)) continue;
+            $content = file_get_contents($file);
+
+            // SPDX header
+            if (preg_match('/SPDX-License-Identifier:\s*(\S+)/', $content, $m)) {
+                return $m[1];
+            }
+
+            // Common license patterns
+            if (strpos($content, 'GNU GENERAL PUBLIC LICENSE') !== false) {
+                if (strpos($content, 'Version 3') !== false) return 'GPL-3.0-or-later';
+                if (strpos($content, 'Version 2') !== false) return 'GPL-2.0-or-later';
+            }
+            if (strpos($content, 'MIT License') !== false) return 'MIT';
+            if (strpos($content, 'Apache License') !== false && strpos($content, 'Version 2.0') !== false) return 'Apache-2.0';
+        }
+
+        return '';
+    }
+
+
+    private function detectLanguageFromFiles(string $root): string
+    {
+        $counts = ['PHP' => 0, 'Go' => 0, 'TypeScript' => 0, 'JavaScript' => 0, 'Python' => 0, 'Shell' => 0];
+
+        $extensions = [
+            'php' => 'PHP', 'go' => 'Go', 'ts' => 'TypeScript',
+            'js' => 'JavaScript', 'py' => 'Python', 'sh' => 'Shell',
+        ];
+
+        // Quick scan: only check top two levels
+        foreach (glob("{$root}/*") ?: [] as $item) {
+            $ext = pathinfo($item, PATHINFO_EXTENSION);
+            if (isset($extensions[$ext])) {
+                $counts[$extensions[$ext]]++;
+            }
+            if (is_dir($item) && basename($item)[0] !== '.') {
+                foreach (glob("{$item}/*") ?: [] as $subItem) {
+                    $ext = pathinfo($subItem, PATHINFO_EXTENSION);
+                    if (isset($extensions[$ext])) {
+                        $counts[$extensions[$ext]]++;
+                    }
+                }
+            }
+        }
+
+        arsort($counts);
+        $top = key($counts);
+        return $counts[$top] > 0 ? $top : '';
+    }
+
+    private function normalizeLicense(string $license): string
+    {
+        $lower = strtolower($license);
+        $isGpl = strpos($lower, 'gpl') !== false || strpos($lower, 'general public license') !== false;
+        if ($isGpl && strpos($lower, '3') !== false) return 'GPL-3.0-or-later';
+        if ($isGpl && strpos($lower, '2') !== false) return 'GPL-2.0-or-later';
+        if ($lower === 'mit' || strpos($lower, 'mit license') !== false) return 'MIT';
+        if (strpos($lower, 'apache') !== false) return 'Apache-2.0';
+        return $license;
+    }
+
+    private function detectRepoName(string $root): string
+    {
+        $gitConfig = "{$root}/.git/config";
+        if (!file_exists($gitConfig)) {
+            return basename($root);
+        }
+
+        $content = file_get_contents($gitConfig);
+        if (preg_match('/url\s*=\s*.*\/([^\/\s]+?)(?:\.git)?\s*$/m', $content, $m)) {
+            return $m[1];
+        }
+
+        return basename($root);
+    }
+
+    // =====================================================================
+    // API interaction
+    // =====================================================================
+
+    private function fetchManifest(string $apiBase, string $org, string $repo, string $token): ?array
+    {
+        $url = "{$apiBase}/repos/{$org}/{$repo}/manifest";
+        $ctx = stream_context_create([
+            'http' => [
+                'header' => "Authorization: token {$token}\r\nAccept: application/json\r\n",
+                'timeout' => 10,
+            ],
+        ]);
+
+        $body = @file_get_contents($url, false, $ctx);
+        if ($body === false) return null;
+
+        return json_decode($body, true);
+    }
+
+    private function computeDiff(array $current, array $detected): array
+    {
+        // Map detected keys to API keys (underscores match)
+        $changes = [];
+
+        foreach ($detected as $key => $value) {
+            $apiKey = $key;
+            $currentVal = $current[$apiKey] ?? '';
+
+            // Only flag as changed if detected value is non-empty and differs
+            if ($value !== '' && $value !== $currentVal) {
+                // Don't overwrite a non-empty API value with a detected value
+                // unless the API value is actually empty
+                if ($currentVal === '' || $this->shouldOverride($key, $currentVal, $value)) {
+                    $changes[$key] = [
+                        'current'  => $currentVal,
+                        'detected' => $value,
+                    ];
+                }
+            }
+        }
+
+        return $changes;
+    }
+
+    private function shouldOverride(string $field, string $current, string $detected): bool
+    {
+        // Version: detected from source is authoritative
+        if ($field === 'version') return true;
+
+        // These fields: source files are authoritative
+        if (in_array($field, ['element_name', 'package_type', 'language', 'entry_point'], true)) {
+            return true;
+        }
+
+        // For other fields, only fill empty — don't overwrite manual edits
+        return false;
+    }
+
+    private function pushManifest(string $apiBase, string $org, string $repo, string $token, array $current, array $update): bool
+    {
+        $merged = array_merge($current, $update);
+        $url = "{$apiBase}/repos/{$org}/{$repo}/manifest";
+        $payload = json_encode($merged);
+
+        $ctx = stream_context_create([
+            'http' => [
+                'method'  => 'PUT',
+                'header'  => "Authorization: token {$token}\r\nContent-Type: application/json\r\nAccept: application/json\r\n",
+                'content' => $payload,
+                'timeout' => 10,
+            ],
+        ]);
+
+        $body = @file_get_contents($url, false, $ctx);
+        return $body !== false;
+    }
+}
+
+$app = new ManifestDetectCli();
+exit($app->execute());

cli/manifest_element.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/manifest_element.php
  * BRIEF: Extract element name, type, type prefix, and ZIP name from manifest
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\{CliFramework, SourceResolver};
 
 class ManifestElementCli extends CliFramework
 {
@@ -48,7 +54,7 @@ class ManifestElementCli extends CliFramework
             }
         }
         $extManifest = null;
-        $manifestFiles = array_merge(glob("{$root}/src/pkg_*.xml") ?: [], glob("{$root}/src/*.xml") ?: [], glob("{$root}/*.xml") ?: []);
+        $manifestFiles = array_merge(SourceResolver::globSource($root, 'pkg_*.xml'), SourceResolver::globSource($root, '*.xml'), glob("{$root}/*.xml") ?: []);
         foreach ($manifestFiles as $file) {
             $c = file_get_contents($file);
             if (strpos($c, '<extension') !== false) {
@@ -58,8 +64,7 @@ class ManifestElementCli extends CliFramework
         }
         $modFile = null;
         $modFiles = array_merge(
-            glob("{$root}/src/core/modules/mod*.class.php") ?: [],
+            SourceResolver::globSource($root, 'core/modules/mod*.class.php'),
-            glob("{$root}/htdocs/core/modules/mod*.class.php") ?: [],
             glob("{$root}/core/modules/mod*.class.php") ?: []
         );
         foreach ($modFiles as $file) {

cli/manifest_integrity.php

@@ -0,0 +1,564 @@
+#!/usr/bin/env php
+<?php
+
+/* Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * FILE INFORMATION
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/manifest_integrity.php
+ * VERSION: 09.32.00
+ * BRIEF: Cross-check manifest API fields against repo contents across the org
+ */
+
+declare(strict_types=1);
+
+require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
+
+use MokoCli\CliFramework;
+
+class ManifestIntegrityCli extends CliFramework
+{
+    protected function configure(): void
+    {
+        $this->setDescription('Cross-check manifest fields against repo contents across the org');
+        $this->addArgument('--path', 'Single repo path (local mode)', '');
+        $this->addArgument('--org', 'Gitea org (bulk mode)', 'MokoConsulting');
+        $this->addArgument('--repo', 'Single repo name (remote mode)', '');
+        $this->addArgument('--token', 'Gitea API token (or GITEA_TOKEN env)', '');
+        $this->addArgument('--api-base', 'Gitea API base URL', 'https://git.mokoconsulting.tech/api/v1');
+        $this->addArgument('--fix', 'Push fixes for detected drift', false);
+        $this->addArgument('--json', 'Output as JSON', false);
+        $this->addArgument('--quiet', 'Only show repos with issues', false);
+    }
+
+    protected function run(): int
+    {
+        $path     = $this->getArgument('--path');
+        $org      = $this->getArgument('--org');
+        $repoName = $this->getArgument('--repo');
+        $token    = $this->getArgument('--token') ?: getenv('GITEA_TOKEN') ?: '';
+        $apiBase  = rtrim($this->getArgument('--api-base'), '/');
+        $fixMode  = (bool) $this->getArgument('--fix');
+        $jsonMode = (bool) $this->getArgument('--json');
+        $quiet    = (bool) $this->getArgument('--quiet');
+
+        if ($token === '') {
+            $this->log('ERROR', 'API token required (use --token or GITEA_TOKEN env)');
+            return 1;
+        }
+
+        // ── Mode selection ──────────────────────────────────────────
+        if ($path !== '') {
+            // Local mode: detect from source + compare to API
+            return $this->checkLocal($path, $org, $repoName, $token, $apiBase, $fixMode, $jsonMode);
+        }
+
+        if ($repoName !== '') {
+            // Single remote repo
+            return $this->checkRemoteRepo($org, $repoName, $token, $apiBase, $fixMode, $jsonMode);
+        }
+
+        // Bulk mode: all repos in org
+        return $this->checkOrg($org, $token, $apiBase, $fixMode, $jsonMode, $quiet);
+    }
+
+    // =====================================================================
+    // Local mode — detect from source, compare to API
+    // =====================================================================
+
+    private function checkLocal(string $path, string $org, string $repoName, string $token, string $apiBase, bool $fix, bool $json): int
+    {
+        $root = realpath($path) ?: $path;
+        if (!is_dir($root)) {
+            $this->log('ERROR', "Path does not exist: {$path}");
+            return 1;
+        }
+
+        if ($repoName === '') {
+            $repoName = $this->detectRepoName($root);
+        }
+
+        // Run manifest_detect logic
+        $detected = $this->runDetect($root, $repoName);
+        $current = $this->fetchManifest($apiBase, $org, $repoName, $token);
+
+        if ($current === null) {
+            $this->log('ERROR', "Failed to fetch manifest for {$org}/{$repoName}");
+            return 1;
+        }
+
+        $issues = $this->validate($current, $detected, $repoName);
+
+        if ($json) {
+            echo json_encode(['repo' => $repoName, 'issues' => $issues], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n";
+        } else {
+            $this->printIssues($repoName, $issues);
+        }
+
+        if ($fix && !empty($issues)) {
+            return $this->applyFixes($apiBase, $org, $repoName, $token, $current, $issues);
+        }
+
+        return empty($issues) ? 0 : 1;
+    }
+
+    // =====================================================================
+    // Remote single repo mode — fetch source files via API
+    // =====================================================================
+
+    private function checkRemoteRepo(string $org, string $repoName, string $token, string $apiBase, bool $fix, bool $json): int
+    {
+        $current = $this->fetchManifest($apiBase, $org, $repoName, $token);
+        if ($current === null) {
+            $this->log('ERROR', "Failed to fetch manifest for {$org}/{$repoName}");
+            return 1;
+        }
+
+        $issues = $this->validateManifestOnly($current, $repoName);
+
+        if ($json) {
+            echo json_encode(['repo' => $repoName, 'issues' => $issues], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n";
+        } else {
+            $this->printIssues($repoName, $issues);
+        }
+
+        if ($fix && !empty($issues)) {
+            return $this->applyFixes($apiBase, $org, $repoName, $token, $current, $issues);
+        }
+
+        return empty($issues) ? 0 : 1;
+    }
+
+    // =====================================================================
+    // Bulk org mode — check all repos
+    // =====================================================================
+
+    private function checkOrg(string $org, string $token, string $apiBase, bool $fix, bool $json, bool $quiet): int
+    {
+        $repos = $this->fetchOrgRepos($apiBase, $org, $token);
+        if ($repos === null) {
+            $this->log('ERROR', "Failed to fetch repos for org {$org}");
+            return 1;
+        }
+
+        $this->log('INFO', "Manifest Integrity Check — {$org} (" . count($repos) . " repos)");
+
+        $allResults = [];
+        $totalIssues = 0;
+        $reposWithIssues = 0;
+
+        foreach ($repos as $repo) {
+            $name = $repo['name'];
+            $manifest = $this->fetchManifest($apiBase, $org, $name, $token);
+
+            if ($manifest === null) {
+                if (!$quiet) {
+                    $this->log('WARN', "{$name}: no manifest");
+                }
+                continue;
+            }
+
+            $issues = $this->validateManifestOnly($manifest, $name);
+
+            if (!empty($issues)) {
+                $reposWithIssues++;
+                $totalIssues += count($issues);
+
+                if ($json) {
+                    $allResults[] = ['repo' => $name, 'issues' => $issues];
+                } else {
+                    $this->printIssues($name, $issues);
+                }
+
+                if ($fix) {
+                    $this->applyFixes($apiBase, $org, $name, $token, $manifest, $issues);
+                }
+            } elseif (!$quiet && !$json) {
+                $this->log('OK', "{$name}: clean");
+            }
+        }
+
+        if ($json) {
+            echo json_encode($allResults, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n";
+        } else {
+            echo "\n";
+            $level = $reposWithIssues > 0 ? 'WARN' : 'OK';
+            $this->log($level, sprintf(
+                'Summary: %d repos checked, %d with issues (%d total issues)',
+                count($repos),
+                $reposWithIssues,
+                $totalIssues
+            ));
+        }
+
+        return $reposWithIssues > 0 ? 1 : 0;
+    }
+
+    // =====================================================================
+    // Validation rules
+    // =====================================================================
+
+    /**
+     * Full validation: compare API manifest against locally-detected fields.
+     */
+    private function validate(array $current, array $detected, string $repoName): array
+    {
+        $issues = [];
+
+        // Required fields that should never be empty
+        $required = ['platform', 'name', 'version', 'package_type', 'language', 'entry_point'];
+        foreach ($required as $field) {
+            if (empty($current[$field])) {
+                $fix = $detected[$field] ?? null;
+                $issues[] = [
+                    'field'    => $field,
+                    'severity' => 'error',
+                    'message'  => 'Missing required field',
+                    'current'  => '',
+                    'fix'      => $fix,
+                ];
+            }
+        }
+
+        // Drift detection: detected value differs from API
+        foreach ($detected as $field => $detectedValue) {
+            $currentValue = $current[$field] ?? '';
+            if ($detectedValue !== '' && $currentValue !== '' && $detectedValue !== $currentValue) {
+                // Version drift is expected on dev branches (suffix)
+                if ($field === 'version' && strpos($detectedValue, $currentValue) === 0) {
+                    continue; // e.g., detected "02.34.50-dev" vs API "02.34.50"
+                }
+                if ($field === 'version' && strpos($currentValue, $detectedValue) === 0) {
+                    continue;
+                }
+
+                $issues[] = [
+                    'field'    => $field,
+                    'severity' => 'warn',
+                    'message'  => 'Drift: source differs from manifest',
+                    'current'  => $currentValue,
+                    'fix'      => $detectedValue,
+                ];
+            }
+        }
+
+        // Platform-specific structure validation
+        $platform = $current['platform'] ?? '';
+        $issues = array_merge($issues, $this->validatePlatformStructure($platform, $current, $repoName));
+
+        return $issues;
+    }
+
+    /**
+     * API-only validation: check manifest fields for completeness and consistency
+     * without access to source files.
+     */
+    private function validateManifestOnly(array $manifest, string $repoName): array
+    {
+        $issues = [];
+
+        // Required fields
+        $required = ['platform', 'name', 'version', 'language'];
+        foreach ($required as $field) {
+            if (empty($manifest[$field])) {
+                $issues[] = [
+                    'field'    => $field,
+                    'severity' => 'error',
+                    'message'  => 'Missing required field',
+                    'current'  => '',
+                    'fix'      => null,
+                ];
+            }
+        }
+
+        // Recommended fields
+        $recommended = ['package_type', 'entry_point', 'license_spdx', 'description'];
+        foreach ($recommended as $field) {
+            if (empty($manifest[$field])) {
+                $issues[] = [
+                    'field'    => $field,
+                    'severity' => 'info',
+                    'message'  => 'Recommended field is empty',
+                    'current'  => '',
+                    'fix'      => null,
+                ];
+            }
+        }
+
+        // Platform-specific checks
+        $platform = $manifest['platform'] ?? '';
+        $issues = array_merge($issues, $this->validatePlatformStructure($platform, $manifest, $repoName));
+
+        return $issues;
+    }
+
+    /**
+     * Platform-specific validation rules.
+     */
+    private function validatePlatformStructure(string $platform, array $manifest, string $repoName): array
+    {
+        $issues = [];
+
+        switch ($platform) {
+            case 'joomla':
+            case 'waas-component':
+                // Joomla repos must have element_name
+                if (empty($manifest['element_name'])) {
+                    $issues[] = [
+                        'field'    => 'element_name',
+                        'severity' => 'error',
+                        'message'  => 'Joomla repos require element_name',
+                        'current'  => '',
+                        'fix'      => null,
+                    ];
+                }
+                // Language should be PHP
+                if (!empty($manifest['language']) && $manifest['language'] !== 'PHP') {
+                    $issues[] = [
+                        'field'    => 'language',
+                        'severity' => 'warn',
+                        'message'  => 'Joomla repos should have language=PHP',
+                        'current'  => $manifest['language'],
+                        'fix'      => 'PHP',
+                    ];
+                }
+                break;
+
+            case 'dolibarr':
+            case 'crm-module':
+                if (!empty($manifest['language']) && $manifest['language'] !== 'PHP') {
+                    $issues[] = [
+                        'field'    => 'language',
+                        'severity' => 'warn',
+                        'message'  => 'Dolibarr repos should have language=PHP',
+                        'current'  => $manifest['language'],
+                        'fix'      => 'PHP',
+                    ];
+                }
+                break;
+
+            case 'go':
+                if (!empty($manifest['language']) && $manifest['language'] !== 'Go') {
+                    $issues[] = [
+                        'field'    => 'language',
+                        'severity' => 'warn',
+                        'message'  => 'Go repos should have language=Go',
+                        'current'  => $manifest['language'],
+                        'fix'      => 'Go',
+                    ];
+                }
+                break;
+
+            case 'mcp':
+                if (!empty($manifest['language']) && !in_array($manifest['language'], ['TypeScript', 'JavaScript'], true)) {
+                    $issues[] = [
+                        'field'    => 'language',
+                        'severity' => 'warn',
+                        'message'  => 'MCP repos should have language=TypeScript or JavaScript',
+                        'current'  => $manifest['language'],
+                        'fix'      => null,
+                    ];
+                }
+                break;
+        }
+
+        // Version format check: should be XX.YY.ZZ
+        $version = $manifest['version'] ?? '';
+        if ($version !== '' && !preg_match('/^\d{2}\.\d{2}\.\d{2}/', $version)) {
+            // Allow semver for node/go repos
+            if (!in_array($platform, ['mcp', 'node', 'go'], true)) {
+                $issues[] = [
+                    'field'    => 'version',
+                    'severity' => 'info',
+                    'message'  => 'Version does not match XX.YY.ZZ format',
+                    'current'  => $version,
+                    'fix'      => null,
+                ];
+            }
+        }
+
+        return $issues;
+    }
+
+    // =====================================================================
+    // Output
+    // =====================================================================
+
+    private function printIssues(string $repoName, array $issues): void
+    {
+        if (empty($issues)) {
+            return;
+        }
+
+        $errors = count(array_filter($issues, fn($i) => $i['severity'] === 'error'));
+        $warns  = count(array_filter($issues, fn($i) => $i['severity'] === 'warn'));
+        $infos  = count($issues) - $errors - $warns;
+
+        echo "\n";
+        $summary = [];
+        if ($errors > 0) $summary[] = "{$errors} error(s)";
+        if ($warns > 0) $summary[] = "{$warns} warning(s)";
+        if ($infos > 0) $summary[] = "{$infos} info";
+        $this->log($errors > 0 ? 'ERROR' : 'WARN', "{$repoName} — " . implode(', ', $summary));
+
+        foreach ($issues as $issue) {
+            $icon = match ($issue['severity']) {
+                'error' => 'ERROR',
+                'warn'  => 'WARN',
+                default => 'INFO',
+            };
+            $msg = sprintf('  %-18s %s', $issue['field'], $issue['message']);
+            if ($issue['current'] !== '') {
+                $msg .= " (current: {$issue['current']})";
+            }
+            if ($issue['fix'] !== null) {
+                $msg .= " → fix: {$issue['fix']}";
+            }
+            $this->log($icon, $msg);
+        }
+    }
+
+    // =====================================================================
+    // Fix application
+    // =====================================================================
+
+    private function applyFixes(string $apiBase, string $org, string $repo, string $token, array $current, array $issues): int
+    {
+        $fixes = [];
+        foreach ($issues as $issue) {
+            if ($issue['fix'] !== null && $issue['fix'] !== '') {
+                $fixes[$issue['field']] = $issue['fix'];
+            }
+        }
+
+        if (empty($fixes)) {
+            $this->log('INFO', "{$repo}: no auto-fixable issues");
+            return 0;
+        }
+
+        $merged = array_merge($current, $fixes);
+        $url = "{$apiBase}/repos/{$org}/{$repo}/manifest";
+        $payload = json_encode($merged);
+
+        $ctx = stream_context_create([
+            'http' => [
+                'method'  => 'PUT',
+                'header'  => "Authorization: token {$token}\r\nContent-Type: application/json\r\nAccept: application/json\r\n",
+                'content' => $payload,
+                'timeout' => 10,
+            ],
+        ]);
+
+        $body = @file_get_contents($url, false, $ctx);
+        if ($body === false) {
+            $this->log('ERROR', "{$repo}: failed to push fixes");
+            return 1;
+        }
+
+        $this->log('OK', "{$repo}: fixed " . implode(', ', array_keys($fixes)));
+        return 0;
+    }
+
+    // =====================================================================
+    // API helpers
+    // =====================================================================
+
+    private function fetchManifest(string $apiBase, string $org, string $repo, string $token): ?array
+    {
+        $url = "{$apiBase}/repos/{$org}/{$repo}/manifest";
+        $ctx = stream_context_create([
+            'http' => [
+                'header'  => "Authorization: token {$token}\r\nAccept: application/json\r\n",
+                'timeout' => 10,
+            ],
+        ]);
+
+        $body = @file_get_contents($url, false, $ctx);
+        if ($body === false) return null;
+
+        $data = json_decode($body, true);
+        return is_array($data) ? $data : null;
+    }
+
+    private function fetchOrgRepos(string $apiBase, string $org, string $token): ?array
+    {
+        $allRepos = [];
+        $page = 1;
+        $limit = 50;
+
+        while (true) {
+            $url = "{$apiBase}/orgs/{$org}/repos?page={$page}&limit={$limit}";
+            $ctx = stream_context_create([
+                'http' => [
+                    'header'  => "Authorization: token {$token}\r\nAccept: application/json\r\n",
+                    'timeout' => 15,
+                ],
+            ]);
+
+            $body = @file_get_contents($url, false, $ctx);
+            if ($body === false) return null;
+
+            $repos = json_decode($body, true);
+            if (!is_array($repos) || empty($repos)) break;
+
+            $allRepos = array_merge($allRepos, $repos);
+
+            if (count($repos) < $limit) break;
+            $page++;
+        }
+
+        // Filter out archived and empty repos
+        return array_filter($allRepos, fn($r) => !($r['archived'] ?? false) && !($r['empty'] ?? false));
+    }
+
+    // =====================================================================
+    // Detection (delegates to manifest_detect logic)
+    // =====================================================================
+
+    private function runDetect(string $root, string $repoName): array
+    {
+        $script = __DIR__ . '/manifest_detect.php';
+        $redirect = PHP_OS_FAMILY === 'Windows' ? '2>NUL' : '2>/dev/null';
+        $cmd = sprintf(
+            'php %s --path %s --repo %s --json --quiet %s',
+            escapeshellarg($script),
+            escapeshellarg($root),
+            escapeshellarg($repoName),
+            $redirect
+        );
+
+        $output = shell_exec($cmd) ?? '';
+
+        // Extract JSON object from output (skip banner/log lines)
+        if (preg_match('/\{[^{}]*(?:\{[^{}]*\}[^{}]*)*\}/s', $output, $m)) {
+            $data = json_decode($m[0], true);
+            if (is_array($data)) {
+                return $data;
+            }
+        }
+
+        return [];
+    }
+
+    private function detectRepoName(string $root): string
+    {
+        $gitConfig = "{$root}/.git/config";
+        if (!file_exists($gitConfig)) {
+            return basename($root);
+        }
+
+        $content = file_get_contents($gitConfig);
+        if (preg_match('/url\s*=\s*.*\/([^\/\s]+?)(?:\.git)?\s*$/m', $content, $m)) {
+            return $m[1];
+        }
+
+        return basename($root);
+    }
+}
+
+$app = new ManifestIntegrityCli();
+exit($app->execute());

cli/manifest_licensing.php

@@ -0,0 +1,288 @@
+#!/usr/bin/env php
+<?php
+
+/* Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * FILE INFORMATION
+<<<<<<< HEAD
+ * DEFGROUP: MokoCLI.CLI
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+ * PATH: /cli/manifest_licensing.php
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/manifest_licensing.php
+ * VERSION: 09.32.00
+>>>>>>> main
+ * BRIEF: Ensure licensing tags (updateservers, dlid) in Joomla extension manifests
+ */
+
+declare(strict_types=1);
+
+require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
+
+use MokoCli\{CliFramework, SourceResolver};
+
+/**
+ * Reads the <licensing> block from .mokogitea/manifest.xml and ensures that the
+ * Joomla extension manifest contains the correct <updateservers> and <dlid> tags.
+ *
+ * manifest.xml licensing block example:
+ *
+ *   <licensing>
+ *     <enabled>true</enabled>
+ *     <dlid>true</dlid>
+ *     <update-server>https://git.mokoconsulting.tech/{org}/{repo}/updates.xml</update-server>
+ *     <update-server-name>MyExtension Updates</update-server-name>
+ *   </licensing>
+ *
+ * Supports {org} and {repo} placeholders in update-server URL, resolved from
+ * the manifest's <identity> block or git remote.
+ */
+class ManifestLicensingCli extends CliFramework
+{
+    protected function configure(): void
+    {
+        $this->setDescription('Ensure licensing tags (updateservers, dlid) in Joomla extension manifests');
+        $this->addArgument('--path', 'Repository root path', '.');
+        $this->addArgument('--fix', 'Apply fixes (default: dry-run check only)', false);
+        $this->addArgument('--github-output', 'Write results to $GITHUB_OUTPUT', false);
+    }
+
+    protected function run(): int
+    {
+        $root     = realpath($this->getArgument('--path')) ?: $this->getArgument('--path');
+        $fix      = (bool) $this->getArgument('--fix');
+        $ghOutput = (bool) $this->getArgument('--github-output');
+
+        // ── 1. Read manifest.xml ──────────────────────────────────────────
+        $manifestFile = "{$root}/.mokogitea/manifest.xml";
+
+        if (!file_exists($manifestFile)) {
+            $this->log('WARN', "No manifest.xml found at {$manifestFile}");
+            $this->outputResult($ghOutput, 'skipped', 'No manifest.xml');
+            return 0;
+        }
+
+        $xml = @simplexml_load_file($manifestFile);
+
+        if ($xml === false) {
+            $this->log('ERROR', "Failed to parse {$manifestFile}");
+            return 1;
+        }
+
+        // ── 2. Check if licensing is enabled ──────────────────────────────
+        if (!isset($xml->licensing) || (string) ($xml->licensing->enabled ?? '') !== 'true') {
+            $this->log('INFO', 'Licensing not enabled in manifest.xml — skipping');
+            $this->outputResult($ghOutput, 'skipped', 'Licensing not enabled');
+            return 0;
+        }
+
+        $licensingNode    = $xml->licensing;
+        $dlidEnabled      = ((string) ($licensingNode->dlid ?? 'true')) === 'true';
+        $updateServerUrl  = (string) ($licensingNode->{'update-server'} ?? '');
+        $updateServerName = (string) ($licensingNode->{'update-server-name'} ?? '');
+
+        // ── 3. Resolve placeholders ───────────────────────────────────────
+        $org  = (string) ($xml->identity->org ?? '');
+        $repo = (string) ($xml->identity->name ?? '');
+
+        // Fallback to git remote if manifest doesn't have org/name
+        if (empty($org) || empty($repo)) {
+            $remote = trim((string) @shell_exec("cd " . escapeshellarg($root) . " && git remote get-url origin 2>/dev/null"));
+
+            if (preg_match('#[/:]([^/]+)/([^/.]+?)(?:\.git)?$#', $remote, $m)) {
+                if (empty($org)) {
+                    $org = $m[1];
+                }
+                if (empty($repo)) {
+                    $repo = $m[2];
+                }
+            }
+        }
+
+        // Default update server URL if not specified
+        if (empty($updateServerUrl) && !empty($org) && !empty($repo)) {
+            $updateServerUrl = "https://git.mokoconsulting.tech/{$org}/{$repo}/updates.xml";
+        }
+
+        // Resolve {org} and {repo} placeholders
+        $updateServerUrl = str_replace(['{org}', '{repo}'], [$org, $repo], $updateServerUrl);
+
+        // Default server name from display-name or repo name
+        if (empty($updateServerName)) {
+            $displayName = (string) ($xml->identity->{'display-name'} ?? $repo);
+            $updateServerName = $displayName . ' Updates';
+        }
+
+        if (empty($updateServerUrl)) {
+            $this->log('ERROR', 'Cannot determine update server URL — set <update-server> in manifest.xml or ensure org/repo are available');
+            return 1;
+        }
+
+        $this->log('INFO', "Licensing enabled — org={$org}, repo={$repo}");
+        $this->log('INFO', "Update server: {$updateServerUrl}");
+        $this->log('INFO', "DLID required: " . ($dlidEnabled ? 'yes' : 'no'));
+
+        // ── 4. Find Joomla extension manifests ────────────────────────────
+        $xmlFiles = array_merge(
+            SourceResolver::globSource($root, '*.xml'),
+            SourceResolver::globSource($root, 'packages/*/*.xml'),
+            glob("{$root}/*.xml") ?: []
+        );
+
+        $packageManifest = null;
+
+        foreach ($xmlFiles as $file) {
+            $content = file_get_contents($file);
+
+            if (!str_contains($content, '<extension')) {
+                continue;
+            }
+
+            // Find the package manifest (type="package") or the main extension manifest
+            if (str_contains($content, 'type="package"')) {
+                $packageManifest = $file;
+                break;
+            }
+
+            // Fallback: first extension manifest found
+            if ($packageManifest === null) {
+                $packageManifest = $file;
+            }
+        }
+
+        if ($packageManifest === null) {
+            $this->log('WARN', 'No Joomla extension manifest found');
+            $this->outputResult($ghOutput, 'skipped', 'No extension manifest');
+            return 0;
+        }
+
+        $relPath = str_replace($root . '/', '', str_replace('\\', '/', $packageManifest));
+        $this->log('INFO', "Package manifest: {$relPath}");
+
+        // ── 5. Check and fix the manifest ─────────────────────────────────
+        $content  = file_get_contents($packageManifest);
+        $original = $content;
+        $changes  = [];
+
+        // --- 5a. Ensure <updateservers> block with correct URL ---
+        if (preg_match('#<updateservers>\s*</updateservers>#s', $content)) {
+            // Empty updateservers block — inject the server
+            $replacement = "<updateservers>\n"
+                . "        <server type=\"extension\" name=\"{$updateServerName}\">{$updateServerUrl}</server>\n"
+                . "    </updateservers>";
+            $content = preg_replace('#<updateservers>\s*</updateservers>#s', $replacement, $content);
+            $changes[] = 'Added update server URL to empty <updateservers>';
+        } elseif (!str_contains($content, '<updateservers>')) {
+            // No updateservers at all — add before </extension>
+            $serverBlock = "\n    <updateservers>\n"
+                . "        <server type=\"extension\" name=\"{$updateServerName}\">{$updateServerUrl}</server>\n"
+                . "    </updateservers>\n";
+            $content = str_replace('</extension>', $serverBlock . '</extension>', $content);
+            $changes[] = 'Added <updateservers> block';
+        } else {
+            // updateservers exists — verify URL is correct
+            if (preg_match('#<server[^>]*>([^<]+)</server>#', $content, $m)) {
+                if ($m[1] !== $updateServerUrl) {
+                    $content = preg_replace(
+                        '#(<server[^>]*>)[^<]+(</server>)#',
+                        "\${1}{$updateServerUrl}\${2}",
+                        $content
+                    );
+                    $changes[] = "Updated server URL: {$m[1]} → {$updateServerUrl}";
+                }
+            }
+        }
+
+        // --- 5b. Ensure <dlid> tag if required ---
+        if ($dlidEnabled) {
+            if (!str_contains($content, '<dlid')) {
+                // Add before <updateservers> if present, otherwise before </extension>
+                $dlidTag = '    <dlid prefix="dlid=" suffix=""/>' . "\n";
+
+                if (str_contains($content, '<updateservers>')) {
+                    $content = str_replace('<updateservers>', $dlidTag . "\n    <updateservers>", $content);
+                } else {
+                    $content = str_replace('</extension>', $dlidTag . '</extension>', $content);
+                }
+
+                $changes[] = 'Added <dlid> tag';
+            }
+        }
+
+        // --- 5c. Ensure <blockChildUninstall> for packages ---
+        if (str_contains($content, 'type="package"') && !str_contains($content, '<blockChildUninstall>')) {
+            $blockTag = '    <blockChildUninstall>true</blockChildUninstall>' . "\n";
+
+            if (str_contains($content, '<dlid')) {
+                // Add after <dlid>
+                $content = preg_replace(
+                    '#(<dlid[^/]*/>\s*\n)#',
+                    "\${1}{$blockTag}",
+                    $content
+                );
+            } elseif (str_contains($content, '<updateservers>')) {
+                $content = str_replace('<updateservers>', $blockTag . "\n    <updateservers>", $content);
+            } else {
+                $content = str_replace('</extension>', $blockTag . '</extension>', $content);
+            }
+
+            $changes[] = 'Added <blockChildUninstall>true</blockChildUninstall>';
+        }
+
+        // ── 6. Report and apply ───────────────────────────────────────────
+        if (empty($changes)) {
+            $this->log('INFO', 'All licensing tags are correct — no changes needed');
+            $this->outputResult($ghOutput, 'ok', 'No changes needed');
+            return 0;
+        }
+
+        foreach ($changes as $change) {
+            $this->log($fix ? 'INFO' : 'WARN', ($fix ? 'Fixed: ' : 'Needs fix: ') . $change);
+        }
+
+        if ($fix) {
+            file_put_contents($packageManifest, $content);
+            $this->log('INFO', "Wrote {$relPath} with " . count($changes) . " change(s)");
+            $this->outputResult($ghOutput, 'fixed', implode('; ', $changes));
+        } else {
+            $this->log('WARN', 'Run with --fix to apply changes');
+            $this->outputResult($ghOutput, 'needs-fix', implode('; ', $changes));
+            return 1;
+        }
+
+        return 0;
+    }
+
+    /**
+     * Write result to $GITHUB_OUTPUT if requested.
+     */
+    private function outputResult(bool $ghOutput, string $status, string $detail): void
+    {
+        if (!$ghOutput) {
+            return;
+        }
+
+        $outputFile = getenv('GITHUB_OUTPUT');
+
+        if ($outputFile === false || $outputFile === '') {
+            echo "licensing_status={$status}\n";
+            echo "licensing_detail={$detail}\n";
+            return;
+        }
+
+        $fh = fopen($outputFile, 'a');
+        fwrite($fh, "licensing_status={$status}\n");
+        fwrite($fh, "licensing_detail={$detail}\n");
+        fclose($fh);
+    }
+}
+
+$app = new ManifestLicensingCli();
+exit($app->execute());

cli/manifest_read.php

@@ -6,126 +6,448 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/manifest_read.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
  * BRIEF: Parse .manifest.xml and output requested field(s) for CI consumption
+=======
+ * DEFGROUP: mokocli.CLI
+ * INGROUP: mokocli
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+ * PATH: /cli/manifest_read.php
+ * VERSION: 09.32.00
+ * BRIEF: Read repo metadata from Gitea manifest API, auto-detect the rest
+>>>>>>> main
  */
 
 declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ManifestReadCli extends CliFramework
 {
+    /** Joomla extension XML element names searched in root and source/ dirs. */
+    private const JOOMLA_XML_ROOTS = ['extension', 'install'];
+
     protected function configure(): void
     {
-        $this->setDescription('Parse manifest.xml and output requested field(s) for CI consumption');
+        $this->setDescription('Read repo metadata from Gitea API with auto-detection fallback');
-        $this->addArgument('--path', 'Repository root path', '.');
+        $this->addArgument('--path',          'Repository root path',                     '.');
-        $this->addArgument('--field', 'Single field name to output', '');
+        $this->addArgument('--field',         'Single field name to output',              '');
-        $this->addArgument('--all', 'Print all fields as KEY=VALUE lines', false);
+        $this->addArgument('--all',           'Print all fields as KEY=VALUE lines',      false);
-        $this->addArgument('--github-output', 'Append all fields to $GITHUB_OUTPUT', false);
+        $this->addArgument('--github-output', 'Append all fields to $GITHUB_OUTPUT',      false);
-        $this->addArgument('--json', 'Output all fields as JSON', false);
+        $this->addArgument('--json',          'Output all fields as JSON',                false);
     }
 
     protected function run(): int
     {
-        $path = $this->getArgument('--path');
+        $path    = $this->getArgument('--path');
-        $field = $this->getArgument('--field');
+        $field   = $this->getArgument('--field');
         $showAll = $this->getArgument('--all');
-        $ghOutput = $this->getArgument('--github-output');
+        $ghOut   = $this->getArgument('--github-output');
         $jsonMode = $this->getArgument('--json');
 
-        // Determine mode
+        $mode = match (true) {
-        if ($ghOutput) {
+            (bool) $ghOut   => 'github-output',
-            $mode = 'github-output';
+            (bool) $showAll => 'all',
-        } elseif ($showAll) {
+            (bool) $jsonMode => 'json',
-            $mode = 'all';
+            default         => 'field',
-        } elseif ($jsonMode) {
+        };
-            $mode = 'json';
+
-        } else {
+        $root = realpath($path) ?: $path;
-            $mode = 'field';
+
+        // ── 1. Resolve org/repo ──────────────────────────────────────────
+        [$org, $repo] = $this->resolveOrgRepo($root);
+
+        // ── 2. Primary: Gitea manifest API ───────────────────────────────
+        $fields = null;
+        if ($org !== '' && $repo !== '') {
+            $fields = $this->fetchFromApi($org, $repo);
         }
 
-        // -- Locate manifest --
+        // ── 3. Fallback: auto-detect from source tree ────────────────────
-        $root = realpath($path) ?: $path;
+        if ($fields === null) {
-        $manifestFile = null;
+            $this->log('INFO', 'API unavailable — falling back to source-tree detection');
+            $fields = $this->autoDetect($root, $repo);
+        }
 
+<<<<<<< HEAD
         // Priority: manifest.xml (current standard)
         $candidates = [
             "{$root}/.mokogitea/manifest.xml",
             "{$root}/.mokogitea/.manifest.xml",    // legacy (dot-prefixed)
-            "{$root}/.mokogitea/.moko-platform",  // legacy v4
+            "{$root}/.mokogitea/.MokoCLI",  // legacy v4
+=======
+        if (empty($fields)) {
+            $this->log('ERROR', "Could not resolve metadata for {$root}");
+            return 1;
+        }
+
+        // Provide backward-compatible aliases (hyphenated → underscore)
+        $fields = $this->addAliases($fields);
+
+        // Strip empty values
+        $fields = array_filter($fields, fn($v) => $v !== '' && $v !== null);
+
+        // ── 4. Output ────────────────────────────────────────────────────
+        return $this->outputFields($fields, $mode, $field);
+    }
+
+    // ── Gitea manifest API ───────────────────────────────────────────────
+
+    private function fetchFromApi(string $org, string $repo): ?array
+    {
+        $token   = getenv('GA_TOKEN') ?: getenv('GITEA_TOKEN') ?: '';
+        $baseUrl = getenv('GITEA_URL') ?: 'https://git.mokoconsulting.tech';
+        $baseUrl = rtrim($baseUrl, '/');
+
+        if ($token === '') {
+            return null;
+        }
+
+        $url = "{$baseUrl}/api/v1/repos/{$org}/{$repo}/manifest";
+        $ctx = stream_context_create([
+            'http' => [
+                'header'  => "Authorization: token {$token}\r\nAccept: application/json\r\n",
+                'timeout' => 10,
+                'ignore_errors' => true,
+            ],
+        ]);
+
+        $body = @file_get_contents($url, false, $ctx);
+        if ($body === false) {
+            return null;
+        }
+
+        // Check HTTP status from response headers
+        $status = 0;
+        if (isset($http_response_header[0])) {
+            preg_match('/\d{3}/', $http_response_header[0], $m);
+            $status = (int) ($m[0] ?? 0);
+        }
+        if ($status < 200 || $status >= 300) {
+            return null;
+        }
+
+        $data = json_decode($body, true);
+        if (!is_array($data) || empty($data)) {
+            return null;
+        }
+
+        $this->log('INFO', "Loaded metadata from Gitea manifest API ({$org}/{$repo})");
+        return $data;
+    }
+
+    // ── Auto-detection fallback ──────────────────────────────────────────
+
+    private function autoDetect(string $root, string $repoName): array
+    {
+        $fields = [
+            'name' => $repoName ?: basename($root),
+            'org'  => 'MokoConsulting',
+>>>>>>> main
         ];
 
-        foreach ($candidates as $candidate) {
+        // Resolve source directory (source/ or src/)
-            if (file_exists($candidate)) {
+        $srcDir = null;
-                $manifestFile = $candidate;
+        foreach (['source', 'src'] as $candidate) {
+            if (is_dir("{$root}/{$candidate}")) {
+                $srcDir = $candidate;
                 break;
             }
         }
 
-        if ($manifestFile === null) {
+        // ── Try Joomla detection ─────────────────────────────────────
-            $this->log('ERROR', "No manifest found in {$root}");
+        $joomlaResult = $this->detectJoomla($root, $srcDir);
-            return 1;
+        if ($joomlaResult !== null) {
+            $fields = array_merge($fields, $joomlaResult);
+            $this->log('INFO', "Auto-detected platform: joomla ({$fields['extension_type']} — {$fields['element_name']})");
+            return $fields;
         }
 
-        // -- Parse XML --
+        // ── Try Dolibarr detection ───────────────────────────────────
-        $xml = @simplexml_load_file($manifestFile);
+        $dolibarrResult = $this->detectDolibarr($root);
+        if ($dolibarrResult !== null) {
+            $fields = array_merge($fields, $dolibarrResult);
+            $this->log('INFO', "Auto-detected platform: dolibarr");
+            return $fields;
+        }
 
-        if ($xml === false) {
+        // ── Generic fallback ─────────────────────────────────────────
-            // Fallback: try YAML format (.mokostandards legacy)
+        $fields['platform'] = $this->detectGenericPlatform($root);
-            $content = file_get_contents($manifestFile);
+        $fields['element_name'] = strtolower($fields['name']);
-            $fields = [];
+        $fields['extension_type'] = 'application';
-            if (preg_match('/^platform:\s*(.+)/m', $content, $m)) {
+        $fields['language'] = $this->detectLanguage($root);
-                $fields['platform'] = trim($m[1], " \t\n\r\"'");
+        if ($srcDir !== null) {
+            $fields['entry_point'] = "{$srcDir}/";
+        }
+
+        $this->log('INFO', "Auto-detected platform: {$fields['platform']}");
+        return $fields;
+    }
+
+    /**
+     * Detect Joomla platform by scanning for extension XML manifests.
+     *
+     * Searches root and source/ dirs for XML files containing <extension type="...">.
+     * Extracts element name from the filename (pkg_*, com_*, mod_*, plg_*, tpl_*) or
+     * from the <element> tag inside the manifest.
+     */
+    private function detectJoomla(string $root, ?string $srcDir): ?array
+    {
+        $searchDirs = [$root];
+        if ($srcDir !== null) {
+            $searchDirs[] = "{$root}/{$srcDir}";
+        }
+
+        foreach ($searchDirs as $dir) {
+            $xmlFiles = glob("{$dir}/*.xml") ?: [];
+            foreach ($xmlFiles as $xmlFile) {
+                $content = @file_get_contents($xmlFile);
+                if ($content === false) {
+                    continue;
+                }
+
+                // Match <extension type="component|module|plugin|package|template|file|library">
+                if (!preg_match('/<extension\s+[^>]*type="([^"]+)"/', $content, $typeMatch)) {
+                    // Also try legacy <install type="...">
+                    if (!preg_match('/<install\s+[^>]*type="([^"]+)"/', $content, $typeMatch)) {
+                        continue;
+                    }
+                }
+
+                $extType = strtolower($typeMatch[1]);
+                $basename = pathinfo($xmlFile, PATHINFO_FILENAME);
+
+                // Try to extract element name from XML <element> tag
+                $xml = @simplexml_load_string($content);
+                $element = '';
+                if ($xml !== false) {
+                    // Package manifests have <files><file ...>element</file></files>
+                    // Component/module manifests have <element> or use filename
+                    $element = (string) ($xml->element ?? '');
+                    if ($element === '') {
+                        $element = strtolower($basename);
+                    }
+                } else {
+                    $element = strtolower($basename);
+                }
+
+                // Derive display name
+                $displayName = (string) ($xml->name ?? ucfirst(str_replace('_', ' ', $basename)));
+
+                return [
+                    'platform'       => 'joomla',
+                    'extension_type' => $extType,
+                    'element_name'   => $element,
+                    'display_name'   => $displayName,
+                    'language'       => 'PHP',
+                    'entry_point'    => ($srcDir ?? '.') . '/',
+                ];
             }
-            if (preg_match('/^standards_version:\s*(.+)/m', $content, $m)) {
+
-                $fields['standards-version'] = trim($m[1], " \t\n\r\"'");
+            // Also check for pkg_*.xml pattern specifically
+            $pkgFiles = glob("{$dir}/pkg_*.xml") ?: [];
+            if (!empty($pkgFiles)) {
+                $basename = pathinfo($pkgFiles[0], PATHINFO_FILENAME);
+                return [
+                    'platform'       => 'joomla',
+                    'extension_type' => 'package',
+                    'element_name'   => strtolower($basename),
+                    'display_name'   => ucfirst(str_replace('_', ' ', $basename)),
+                    'language'       => 'PHP',
+                    'entry_point'    => ($srcDir ?? '.') . '/',
+                ];
             }
-            if (preg_match('/^governed_repo:\s*(.+)/m', $content, $m)) {
+        }
-                $fields['name'] = trim($m[1], " \t\n\r\"'");
+
+        // Check for com_*/manifest.xml pattern (component subdirectory)
+        $comDirs = glob("{$root}/com_*", GLOB_ONLYDIR) ?: [];
+        foreach ($comDirs as $comDir) {
+            $comManifest = glob("{$comDir}/*.xml") ?: [];
+            foreach ($comManifest as $xmlFile) {
+                $content = @file_get_contents($xmlFile);
+                if ($content && preg_match('/<extension\s+[^>]*type="component"/', $content)) {
+                    return [
+                        'platform'       => 'joomla',
+                        'extension_type' => 'component',
+                        'element_name'   => strtolower(basename($comDir)),
+                        'display_name'   => ucfirst(str_replace('com_', '', basename($comDir))),
+                        'language'       => 'PHP',
+                        'entry_point'    => ($srcDir ?? '.') . '/',
+                    ];
+                }
             }
-        } else {
+        }
-            // Register namespace for XPath (optional, simple path works without)
+
-            $fields = [
+        return null;
-                'name'              => (string)($xml->identity->name ?? ''),
+    }
-                'display-name'      => (string)($xml->identity->{"display-name"} ?? ''),
+
-                'org'               => (string)($xml->identity->org ?? ''),
+    /**
-                'description'       => (string)($xml->identity->description ?? ''),
+     * Detect Dolibarr platform by scanning for module descriptor files.
-                'license'           => (string)($xml->identity->license ?? ''),
+     */
-                'license-spdx'      => (string)($xml->identity->license['spdx'] ?? ''),
+    private function detectDolibarr(string $root): ?array
-                'platform'          => (string)($xml->governance->platform ?? ''),
+    {
-                'standards-version' => (string)($xml->governance->{"standards-version"} ?? ''),
+        // Look for mod*.class.php containing DolibarrModules
-                'standards-source'  => (string)($xml->governance->{"standards-source"} ?? ''),
+        $searchPaths = [
-                'language'          => (string)($xml->build->language ?? ''),
+            "{$root}/core/modules/mod*.class.php",
-                'package-type'      => (string)($xml->build->{"package-type"} ?? ''),
+            "{$root}/*/core/modules/mod*.class.php",
-                'entry-point'       => (string)($xml->build->{"entry-point"} ?? ''),
+        ];
-                'version'           => (string)($xml->identity->version ?? ''),
+
-                'source-dir'        => (string)($xml->deploy->{"source-dir"} ?? ''),
+        foreach ($searchPaths as $pattern) {
-                'remote-subdir'     => (string)($xml->deploy->{"remote-subdir"} ?? ''),
+            $files = glob($pattern) ?: [];
-                'excludes'          => (string)($xml->deploy->excludes ?? ''),
+            foreach ($files as $file) {
-                'dev-host'          => (string)($xml->deploy->{"dev-host"} ?? ''),
+                $content = @file_get_contents($file);
-                'demo-host'         => (string)($xml->deploy->{"demo-host"} ?? ''),
+                if ($content && str_contains($content, 'DolibarrModules')) {
-                'manifest-file'     => $manifestFile,
+                    $modName = pathinfo($file, PATHINFO_FILENAME);
+                    // modMyModule.class → mymodule
+                    $element = strtolower(preg_replace('/^mod/', '', str_replace('.class', '', $modName)));
+
+                    return [
+                        'platform'       => 'dolibarr',
+                        'extension_type' => 'module',
+                        'element_name'   => $element,
+                        'display_name'   => ucfirst($element),
+                        'language'       => 'PHP',
+                        'entry_point'    => './',
+                    ];
+                }
+            }
+        }
+
+        // Secondary: check for update.txt (Dolibarr marker)
+        if (file_exists("{$root}/update.txt")) {
+            return [
+                'platform'       => 'dolibarr',
+                'extension_type' => 'module',
+                'element_name'   => strtolower(basename($root)),
+                'display_name'   => basename($root),
+                'language'       => 'PHP',
+                'entry_point'    => './',
             ];
         }
 
-        // Strip empty values for cleaner output
+        return null;
-        $fields = array_filter($fields, fn($v) => $v !== '');
+    }
 
-        // -- Output --
+    /**
+     * Detect generic platform type (php, nodejs, python, etc.) from project files.
+     */
+    private function detectGenericPlatform(string $root): string
+    {
+        if (file_exists("{$root}/composer.json")) {
+            return 'php';
+        }
+        if (file_exists("{$root}/package.json")) {
+            return 'nodejs';
+        }
+        if (file_exists("{$root}/pyproject.toml") || file_exists("{$root}/setup.py")) {
+            return 'python';
+        }
+        if (file_exists("{$root}/go.mod")) {
+            return 'go';
+        }
+        if (file_exists("{$root}/Cargo.toml")) {
+            return 'rust';
+        }
+        return 'generic';
+    }
+
+    /**
+     * Detect primary language from project files.
+     */
+    private function detectLanguage(string $root): string
+    {
+        if (file_exists("{$root}/composer.json")) {
+            return 'PHP';
+        }
+        if (file_exists("{$root}/tsconfig.json")) {
+            return 'TypeScript';
+        }
+        if (file_exists("{$root}/package.json")) {
+            return 'JavaScript';
+        }
+        if (file_exists("{$root}/pyproject.toml") || file_exists("{$root}/setup.py")) {
+            return 'Python';
+        }
+        return '';
+    }
+
+    // ── Org/repo resolution ──────────────────────────────────────────────
+
+    /**
+     * Resolve org and repo name from environment or git remote.
+     *
+     * @return array{0: string, 1: string}  [org, repo]
+     */
+    private function resolveOrgRepo(string $root): array
+    {
+        // 1. GITHUB_REPOSITORY env (set in Gitea Actions / GitHub Actions)
+        $envRepo = getenv('GITHUB_REPOSITORY') ?: '';
+        if ($envRepo !== '' && str_contains($envRepo, '/')) {
+            return explode('/', $envRepo, 2);
+        }
+
+        // 2. Parse git remote origin URL
+        $remoteUrl = trim((string) shell_exec(
+            'git -C ' . escapeshellarg($root) . ' remote get-url origin 2>/dev/null'
+        ));
+
+        if ($remoteUrl !== '') {
+            // SSH: git@host:Org/Repo.git  or  HTTPS: https://host/Org/Repo.git
+            if (preg_match('#[/:]([^/]+)/([^/]+?)(?:\.git)?$#', $remoteUrl, $m)) {
+                return [$m[1], $m[2]];
+            }
+        }
+
+        return ['', basename($root)];
+    }
+
+    // ── Backward-compatible aliases ──────────────────────────────────────
+
+    /**
+     * Add hyphenated aliases for underscore fields (backward compat with old manifest.xml consumers).
+     * Also map old field names to new ones.
+     */
+    private function addAliases(array $fields): array
+    {
+        // Map API field names → old manifest.xml hyphenated names
+        $aliases = [
+            'display_name'       => 'display-name',
+            'license_spdx'       => 'license-spdx',
+            'license_name'       => 'license',
+            'standards_version'  => 'standards-version',
+            'standards_source'   => 'standards-source',
+            'extension_type'     => 'package-type',
+            'entry_point'        => 'entry-point',
+            'element_name'       => 'name',
+        ];
+
+        foreach ($aliases as $newKey => $oldKey) {
+            if (isset($fields[$newKey]) && !isset($fields[$oldKey])) {
+                $fields[$oldKey] = $fields[$newKey];
+            }
+        }
+
+        return $fields;
+    }
+
+    // ── Output ───────────────────────────────────────────────────────────
+
+    private function outputFields(array $fields, string $mode, string $field): int
+    {
         switch ($mode) {
             case 'field':
                 if ($field === '') {
-                    $this->log('ERROR', "Usage: manifest_read.php --path <dir> --field <name>");
+                    $this->log('ERROR', "Usage: manifest:read --path <dir> --field <name>");
-                    $this->log('ERROR', "       manifest_read.php --path <dir> --all");
+                    $this->log('ERROR', "       manifest:read --path <dir> --all");
-                    $this->log('ERROR', "       manifest_read.php --path <dir> --json");
+                    $this->log('ERROR', "       manifest:read --path <dir> --json");
-                    $this->log('ERROR', "       manifest_read.php --path <dir> --github-output");
+                    $this->log('ERROR', "       manifest:read --path <dir> --github-output");
                     return 2;
                 }
                 echo ($fields[$field] ?? '') . "\n";
@@ -142,22 +464,21 @@ class ManifestReadCli extends CliFramework
                 break;
 
             case 'github-output':
-                $outputFile = getenv('GITHUB_OUTPUT');
+                $outputFile = getenv('GITHUB_OUTPUT') ?: getenv('GITEA_OUTPUT') ?: '';
-                if ($outputFile === false || $outputFile === '') {
+                $lines = [];
-                    $this->log('ERROR', 'GITHUB_OUTPUT not set — printing to stdout instead');
+                foreach ($fields as $k => $v) {
-                    foreach ($fields as $k => $v) {
+                    $envKey = str_replace('-', '_', $k);
-                        // Convert field-name to FIELD_NAME for env var style
+                    $lines[$envKey] = "{$envKey}={$v}\n";
-                        $envKey = str_replace('-', '_', $k);
+                }
-                        echo "{$envKey}={$v}\n";
+                // Deduplicate (aliases may collide after underscore conversion)
-                    }
+                $output = implode('', $lines);
+
+                if ($outputFile === '') {
+                    $this->log('WARNING', 'GITHUB_OUTPUT not set — printing to stdout');
+                    echo $output;
                 } else {
-                    $fh = fopen($outputFile, 'a');
+                    file_put_contents($outputFile, $output, FILE_APPEND);
-                    foreach ($fields as $k => $v) {
+                    $this->log('INFO', "Wrote " . count($lines) . " fields to GITHUB_OUTPUT");
-                        $envKey = str_replace('-', '_', $k);
-                        fwrite($fh, "{$envKey}={$v}\n");
-                    }
-                    fclose($fh);
-                    $this->log('INFO', "Wrote " . count($fields) . " fields to GITHUB_OUTPUT");
                 }
                 break;
         }

cli/package_build.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/package_build.php
  * BRIEF: Build ZIP and tar.gz install packages for Joomla/Dolibarr/generic projects
  *
@@ -19,7 +25,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\{CliFramework, SourceResolver};
 
 class PackageBuildCli extends CliFramework
 {
@@ -56,18 +62,13 @@ class PackageBuildCli extends CliFramework
         }
 
         // -- Determine source directory -----------------------------------------------
-        $sourceDir = null;
+        $sourceDir = SourceResolver::resolveAbsolute($root);
-        foreach (['src', 'htdocs'] as $candidate) {
-            if (is_dir("{$root}/{$candidate}")) {
-                $sourceDir = "{$root}/{$candidate}";
-                break;
-            }
-        }
 
         if ($sourceDir === null) {
-            $this->log('ERROR', "No src/ or htdocs/ directory found in {$root}");
+            $this->log('ERROR', "No source/ or src/ directory found in {$root}");
             return 1;
         }
+        SourceResolver::warnIfLegacy($root);
 
         // -- Determine element and type prefix from manifest --------------------------
         $extElement = $elementOverride;

cli/platform_detect.php

@@ -6,25 +6,40 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/platform_detect.php
- * BRIEF: Detect platform from manifest.xml file — outputs platform string
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/platform_detect.php
+ * VERSION: 09.32.00
+>>>>>>> main
+ * BRIEF: Auto-detect repository platform type and optionally update manifest
  */
 
 declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class PlatformDetectCli extends CliFramework
 {
     protected function configure(): void
     {
-        $this->setDescription('Detect platform from manifest.xml file');
+        $this->setDescription('Auto-detect repository platform type and optionally update manifest');
-        $this->addArgument('--path', 'Repository root path', '.');
+        $this->addArgument('--path', 'Local repo path to scan (default: .)', '.');
+        $this->addArgument('--token', 'Gitea API token for updating manifest', '');
+        $this->addArgument('--gitea-url', 'Gitea URL (default: https://git.mokoconsulting.tech)', 'https://git.mokoconsulting.tech');
+        $this->addArgument('--owner', 'Repo owner for API update', '');
+        $this->addArgument('--repo', 'Repo name for API update', '');
+        $this->addArgument('--update', 'Update manifest.platform via API (flag)', 'false');
+        $this->addArgument('--github-output', 'Append platform=xxx to $GITHUB_OUTPUT (flag)', 'false');
     }
 
     protected function run(): int
@@ -32,25 +47,161 @@ class PlatformDetectCli extends CliFramework
         $path = $this->getArgument('--path');
         $root = realpath($path) ?: $path;
 
-        // Check .mokogitea/manifest.xml first, fallback to root
+        $token = $this->getArgument('--token');
-        $file = "{$root}/.mokogitea/manifest.xml";
+        $giteaUrl = rtrim($this->getArgument('--gitea-url'), '/');
-        if (!file_exists($file)) {
+        $owner = $this->getArgument('--owner');
-            $file = "{$root}/.mokostandards";
+        $repo = $this->getArgument('--repo');
-        }
+        $doUpdate = $this->isFlagSet('--update');
-        if (!file_exists($file)) {
+        $githubOutput = $this->isFlagSet('--github-output');
-            echo "unknown\n";
+
-            return 0;
+        $platform = $this->detectPlatform($root);
+
+        $this->log('INFO', "Detected platform: {$platform}");
+        echo $platform . "\n";
+
+        // Append to $GITHUB_OUTPUT if requested
+        if ($githubOutput) {
+            $outputFile = getenv('GITHUB_OUTPUT');
+
+            if ($outputFile !== false && $outputFile !== '') {
+                file_put_contents($outputFile, "platform={$platform}\n", FILE_APPEND);
+                $this->log('INFO', "Appended platform={$platform} to \$GITHUB_OUTPUT");
+            } else {
+                $this->log('WARN', '$GITHUB_OUTPUT is not set; skipping output append.');
+            }
         }
 
-        $content = file_get_contents($file);
+        // Update manifest via API if requested
-        if (preg_match('/^platform:\s*(.+)/m', $content, $m)) {
+        if ($doUpdate) {
-            echo trim($m[1], " \t\n\r\"'") . "\n";
+            if ($token === '' || $owner === '' || $repo === '') {
-        } else {
+                $this->log('ERROR', '--update requires --token, --owner, and --repo.');
-            echo "unknown\n";
+                return 1;
+            }
+
+            if ($this->dryRun) {
+                $this->log('INFO', "[DRY RUN] Would update manifest.platform to \"{$platform}\" "
+                    . "for {$owner}/{$repo}.");
+                return 0;
+            }
+
+            $this->log('INFO', "Updating manifest.platform for {$owner}/{$repo} to \"{$platform}\"...");
+
+            $response = $this->apiRequest(
+                $giteaUrl,
+                $token,
+                'PATCH',
+                "/api/v1/repos/{$owner}/{$repo}/metadata",
+                json_encode(['platform' => $platform])
+            );
+
+            if ($response['code'] >= 200 && $response['code'] < 300) {
+                $this->log('INFO', "Manifest updated successfully (HTTP {$response['code']}).");
+            } else {
+                $this->log('ERROR', "Failed to update manifest (HTTP {$response['code']}): "
+                    . $response['body']);
+                return 1;
+            }
         }
 
         return 0;
     }
+
+    private function detectPlatform(string $root): string
+    {
+        // 1. Joomla — has pkg_*.xml or Joomla-style extension manifest
+        $joomlaIndicators = array_merge(
+            glob("{$root}/source/pkg_*.xml") ?: [],
+            glob("{$root}/pkg_*.xml") ?: [],
+            glob("{$root}/source/packages/*/services/provider.php") ?: [],
+            glob("{$root}/**/templateDetails.xml") ?: [],
+        );
+        if (!empty($joomlaIndicators)) {
+            return 'joomla';
+        }
+
+        // 2. Dolibarr — has mod*.class.php or dolibarr module descriptor
+        $doliIndicators = array_merge(
+            glob("{$root}/core/modules/mod*.class.php") ?: [],
+            glob("{$root}/class/*.class.php") ?: [],
+        );
+        if (!empty($doliIndicators) && file_exists("{$root}/langs")) {
+            return 'dolibarr';
+        }
+
+        // 3. Go — has go.mod
+        if (file_exists("{$root}/go.mod")) {
+            return 'go';
+        }
+
+        // 4. MCP — has package.json with mcp-related content or dist/index.js pattern
+        if (file_exists("{$root}/package.json")) {
+            $pkg = json_decode(file_get_contents("{$root}/package.json"), true);
+            $name = $pkg['name'] ?? '';
+            if (str_contains($name, 'mcp') || isset($pkg['dependencies']['@modelcontextprotocol/sdk'])) {
+                return 'mcp';
+            }
+        }
+
+        // 5. Platform — is MokoCLI itself or org-config
+        $repoName = basename($root);
+        if (in_array($repoName, ['mokocli', 'mokoplatform', 'mokogitea-org-config'])) {
+            return 'platform';
+        }
+
+        // 6. Default
+        return 'generic';
+    }
+
+    private function isFlagSet(string $flag): bool
+    {
+        $value = $this->getArgument($flag);
+
+        return $value === 'true' || $value === '1' || $value === 'yes';
+    }
+
+    private function apiRequest(
+        string $giteaUrl,
+        string $token,
+        string $method,
+        string $endpoint,
+        ?string $body = null
+    ): array {
+        $url = $giteaUrl . $endpoint;
+
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, [
+            'Content-Type: application/json',
+            'Accept: application/json',
+            "Authorization: token {$token}",
+        ]);
+
+        if ($body !== null) {
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
+        }
+
+        $responseBody = curl_exec($ch);
+        $httpCode = (int) curl_getinfo(
+            $ch,
+            CURLINFO_HTTP_CODE
+        );
+
+        if (curl_errno($ch)) {
+            $error = curl_error($ch);
+            curl_close($ch);
+
+            return [
+                'code' => 0,
+                'body' => "cURL error: {$error}",
+            ];
+        }
+
+        curl_close($ch);
+
+        return ['code' => $httpCode, 'body' => $responseBody];
+    }
 }
 
 $app = new PlatformDetectCli();

cli/release.php

@@ -6,24 +6,36 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/release.php
- * BRIEF: Automate the moko-platform version branch release flow
+ * BRIEF: Automate the MokoCLI version branch release flow
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/release.php
+ * BRIEF: Automate the mokoplatform version branch release flow
+>>>>>>> main
  */
 
 declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ReleaseCli extends CliFramework
 {
     protected function configure(): void
     {
-        $this->setDescription('Automate the moko-platform version branch release flow');
+<<<<<<< HEAD
+        $this->setDescription('Automate the MokoCLI version branch release flow');
+=======
+        $this->setDescription('Automate the mokoplatform version branch release flow');
+>>>>>>> main
         $this->addArgument('--bump', 'Bump type: patch, minor, or major', '');
     }
 

cli/release_body_update.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/release_body_update.php
  * BRIEF: Update Gitea release body with changelog extract and checksums
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ReleaseBodyUpdateCli extends CliFramework
 {

cli/release_cascade.php

@@ -6,31 +6,345 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/release_cascade.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
  * BRIEF: DEPRECATED — cascade behavior removed. Each release stream is independent.
+=======
+ * DEFGROUP: mokocli.CLI
+ * INGROUP: mokocli
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+ * PATH: /cli/release_cascade.php
+ * VERSION: 09.32.00
+ * BRIEF: Cascade release zip to all lower stability channels
+>>>>>>> main
  */
 
 declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ReleaseCascadeCli extends CliFramework
 {
+    /** Channel hierarchy: highest stability first. */
+    private const CHANNELS = ['stable', 'release-candidate', 'beta', 'alpha', 'development'];
+
+    /** Map stability input names to canonical tag names. */
+    private const TAG_MAP = [
+        'stable'            => 'stable',
+        'release-candidate' => 'release-candidate',
+        'rc'                => 'release-candidate',
+        'beta'              => 'beta',
+        'alpha'             => 'alpha',
+        'development'       => 'development',
+        'dev'               => 'development',
+    ];
+
     protected function configure(): void
     {
-        $this->setDescription('DEPRECATED — cascade behavior removed');
+        $this->setDescription('Cascade release zip to all lower stability channels');
+        $this->addArgument('--stability', 'Source stability channel (required)', '');
+        $this->addArgument('--token', 'Gitea API token (required)', '');
+        $this->addArgument('--api-base', 'Gitea API base URL for the repo (required)', '');
     }
 
     protected function run(): int
     {
-        $this->log('INFO', 'No-op (cascade behavior removed — each stream is independent)');
+        $stability = strtolower($this->getArgument('--stability'));
-        return 0;
+        $token     = $this->getArgument('--token');
+        $apiBase   = rtrim($this->getArgument('--api-base'), '/');
+
+        if ($token === '') {
+            $envToken = getenv('MOKOGITEA_TOKEN');
+            if ($envToken === false || $envToken === '') {
+                $envToken = getenv('GITEA_TOKEN');
+            }
+            if ($envToken !== false && $envToken !== '') {
+                $token = $envToken;
+            }
+        }
+
+        if ($stability === '' || $token === '' || $apiBase === '') {
+            $this->log('ERROR', 'Usage: release_cascade.php --stability CHANNEL --token TOKEN --api-base URL');
+            return 1;
+        }
+
+        $sourceTag = self::TAG_MAP[$stability] ?? null;
+        if ($sourceTag === null) {
+            $this->log('ERROR', "Unknown stability: {$stability}");
+            return 1;
+        }
+
+        // Find lower channels to cascade to
+        $lowerChannels = $this->getLowerChannels($sourceTag);
+        if (count($lowerChannels) === 0) {
+            $this->log('INFO', "No lower channels for '{$stability}' — nothing to cascade.");
+            return 0;
+        }
+
+        $this->log('INFO', "Cascading from '{$sourceTag}' to: " . implode(', ', $lowerChannels));
+
+        if ($this->dryRun) {
+            $this->log('INFO', '[DRY RUN] No changes will be made.');
+        }
+
+        // 1. Get source release
+        $sourceRelease = $this->giteaApi("{$apiBase}/releases/tags/{$sourceTag}", $token);
+        if ($sourceRelease === null) {
+            $this->log('WARN', "No release found at tag '{$sourceTag}' — nothing to cascade.");
+            return 0;
+        }
+
+        $sourceVersion = $sourceRelease['name'] ?? $sourceTag;
+        $sourceBody    = $sourceRelease['body'] ?? '';
+        $sourceAssets  = $sourceRelease['assets'] ?? [];
+
+        // Find zip assets (exclude .sha256 sidecars)
+        $zipAssets = array_filter($sourceAssets, function (array $asset): bool {
+            $name = strtolower($asset['name'] ?? '');
+            return str_ends_with($name, '.zip') && !str_ends_with($name, '.sha256');
+        });
+
+        // Also grab sha256 sidecars
+        $sha256Assets = array_filter($sourceAssets, function (array $asset): bool {
+            return str_ends_with(strtolower($asset['name'] ?? ''), '.zip.sha256');
+        });
+
+        if (count($zipAssets) === 0) {
+            $this->log('WARN', "Source release '{$sourceTag}' has no zip assets — nothing to cascade.");
+            return 0;
+        }
+
+        $this->log('INFO', "Source: {$sourceVersion} — " . count($zipAssets) . " zip(s)");
+        echo "\n";
+
+        // 2. Download source assets to temp files
+        $downloads = [];
+        foreach (array_merge($zipAssets, $sha256Assets) as $asset) {
+            $url = $asset['browser_download_url'] ?? '';
+            if ($url === '') {
+                continue;
+            }
+            $tmpFile = tempnam(sys_get_temp_dir(), 'cascade_');
+            if ($this->downloadFile($url, $token, $tmpFile)) {
+                $downloads[] = ['name' => $asset['name'], 'path' => $tmpFile];
+                $this->log('INFO', "Downloaded: {$asset['name']}");
+            } else {
+                $this->log('ERROR', "Failed to download: {$asset['name']}");
+            }
+        }
+
+        if (count($downloads) === 0) {
+            $this->log('ERROR', 'Could not download any source assets.');
+            return 1;
+        }
+
+        // 3. Cascade to each lower channel
+        $errors = 0;
+        foreach ($lowerChannels as $targetTag) {
+            echo "\n";
+            $result = $this->cascadeToChannel(
+                $apiBase, $token, $targetTag,
+                $sourceVersion, $sourceBody, $downloads
+            );
+            if (!$result) {
+                $errors++;
+            }
+        }
+
+        // 4. Cleanup temp files
+        foreach ($downloads as $dl) {
+            @unlink($dl['path']);
+        }
+
+        echo "\n";
+        $this->log('INFO', "Cascade complete. " . (count($lowerChannels) - $errors)
+            . "/" . count($lowerChannels) . " channels updated.");
+
+        return $errors > 0 ? 1 : 0;
+    }
+
+    /**
+     * Cascade assets to a single target channel.
+     */
+    private function cascadeToChannel(
+        string $apiBase,
+        string $token,
+        string $targetTag,
+        string $sourceVersion,
+        string $sourceBody,
+        array $downloads
+    ): bool {
+        $this->log('INFO', "→ {$targetTag}");
+
+        if ($this->dryRun) {
+            $this->log('INFO', "  [DRY RUN] Would cascade to {$targetTag}");
+            return true;
+        }
+
+        // Find existing release at target tag
+        $existing = $this->giteaApi("{$apiBase}/releases/tags/{$targetTag}", $token);
+
+        if ($existing !== null && !empty($existing['id'])) {
+            $releaseId = (int) $existing['id'];
+
+            // Delete existing assets
+            $existingAssets = $existing['assets'] ?? [];
+            foreach ($existingAssets as $asset) {
+                $assetId = $asset['id'] ?? 0;
+                if ($assetId > 0) {
+                    $this->giteaApi(
+                        "{$apiBase}/releases/{$releaseId}/assets/{$assetId}",
+                        $token, 'DELETE'
+                    );
+                }
+            }
+
+            // Update release metadata
+            $updatePayload = json_encode([
+                'name' => $sourceVersion,
+                'body' => $sourceBody,
+            ]);
+            $this->giteaApi(
+                "{$apiBase}/releases/{$releaseId}",
+                $token, 'PATCH', $updatePayload
+            );
+
+            $this->log('INFO', "  Updated release metadata (id: {$releaseId})");
+        } else {
+            // Create new release at target tag
+            // Use the source release's target commitish so the tag points to the same commit
+            $createPayload = json_encode([
+                'tag_name'          => $targetTag,
+                'target_commitish'  => 'main',
+                'name'              => $sourceVersion,
+                'body'              => $sourceBody,
+                'prerelease'        => ($targetTag !== 'stable'),
+            ]);
+            $newRelease = $this->giteaApi("{$apiBase}/releases", $token, 'POST', $createPayload);
+            if ($newRelease === null || empty($newRelease['id'])) {
+                $this->log('ERROR', "  Failed to create release at tag '{$targetTag}'");
+                return false;
+            }
+            $releaseId = (int) $newRelease['id'];
+            $this->log('INFO', "  Created release (id: {$releaseId})");
+        }
+
+        // Upload assets
+        foreach ($downloads as $dl) {
+            $uploadUrl = "{$apiBase}/releases/{$releaseId}/assets?name=" . rawurlencode($dl['name']);
+            $success = $this->uploadAsset($uploadUrl, $token, $dl['path'], $dl['name']);
+            if ($success) {
+                $this->log('INFO', "  Uploaded: {$dl['name']}");
+            } else {
+                $this->log('ERROR', "  Failed to upload: {$dl['name']}");
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Get all channels below the given source channel.
+     */
+    private function getLowerChannels(string $sourceTag): array
+    {
+        $idx = array_search($sourceTag, self::CHANNELS, true);
+        if ($idx === false) {
+            return [];
+        }
+        return array_slice(self::CHANNELS, $idx + 1);
+    }
+
+    /**
+     * Download a file via HTTP.
+     */
+    private function downloadFile(string $url, string $token, string $destPath): bool
+    {
+        $ch = curl_init($url);
+        if ($ch === false) {
+            return false;
+        }
+        $fp = fopen($destPath, 'wb');
+        if ($fp === false) {
+            return false;
+        }
+        curl_setopt_array($ch, [
+            CURLOPT_FOLLOWLOCATION => true,
+            CURLOPT_FILE           => $fp,
+            CURLOPT_HTTPHEADER     => ["Authorization: token {$token}"],
+            CURLOPT_TIMEOUT        => 120,
+        ]);
+        curl_exec($ch);
+        $code = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        curl_close($ch);
+        fclose($fp);
+        return $code >= 200 && $code < 300;
+    }
+
+    /**
+     * Upload a file as a release asset via multipart form.
+     */
+    private function uploadAsset(string $url, string $token, string $filePath, string $fileName): bool
+    {
+        $ch = curl_init($url);
+        if ($ch === false) {
+            return false;
+        }
+        $cfile = new CURLFile($filePath, 'application/octet-stream', $fileName);
+        curl_setopt_array($ch, [
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_POST           => true,
+            CURLOPT_POSTFIELDS     => ['attachment' => $cfile],
+            CURLOPT_HTTPHEADER     => ["Authorization: token {$token}"],
+            CURLOPT_TIMEOUT        => 120,
+        ]);
+        $response = curl_exec($ch);
+        $code = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        curl_close($ch);
+        return $code >= 200 && $code < 300;
+    }
+
+    /**
+     * Make an HTTP request to the Gitea API.
+     */
+    private function giteaApi(
+        string $url,
+        string $token,
+        string $method = 'GET',
+        ?string $body = null
+    ): ?array {
+        $ch = curl_init($url);
+        if ($ch === false) {
+            return null;
+        }
+        curl_setopt_array($ch, [
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_HTTPHEADER     => [
+                "Authorization: token {$token}",
+                'Content-Type: application/json',
+            ],
+            CURLOPT_TIMEOUT        => 30,
+            CURLOPT_CUSTOMREQUEST  => $method,
+        ]);
+        if ($body !== null) {
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
+        }
+        $response = curl_exec($ch);
+        $httpCode = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        curl_close($ch);
+
+        if ($httpCode < 200 || $httpCode >= 300 || empty($response) || !is_string($response)) {
+            return null;
+        }
+
+        $decoded = json_decode($response, true);
+        return is_array($decoded) ? $decoded : null;
     }
 }
 

cli/release_create.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/release_create.php
  * BRIEF: Create or overwrite a Gitea release with proper naming
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\{CliFramework, SourceResolver};
 
 class ReleaseCreateCli extends CliFramework
 {
@@ -97,8 +103,8 @@ class ReleaseCreateCli extends CliFramework
         // Find extension manifest (Joomla XML)
         $extManifest = null;
         $manifestFiles = array_merge(
-            glob("{$root}/src/pkg_*.xml") ?: [],
+            SourceResolver::globSource($root, 'pkg_*.xml'),
-            glob("{$root}/src/*.xml") ?: [],
+            SourceResolver::globSource($root, '*.xml'),
             glob("{$root}/*.xml") ?: []
         );
         foreach ($manifestFiles as $file) {
@@ -112,8 +118,7 @@ class ReleaseCreateCli extends CliFramework
         // Find Dolibarr module file
         $modFile = null;
         $modFiles = array_merge(
-            glob("{$root}/src/core/modules/mod*.class.php") ?: [],
+            SourceResolver::globSource($root, 'core/modules/mod*.class.php'),
-            glob("{$root}/htdocs/core/modules/mod*.class.php") ?: [],
             glob("{$root}/core/modules/mod*.class.php") ?: []
         );
         foreach ($modFiles as $file) {

cli/release_manage.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/release_manage.php
  * BRIEF: Create/update Gitea releases, upload assets, update release body
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ReleaseManageCli extends CliFramework
 {

cli/release_mirror.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/release_mirror.php
  * BRIEF: Mirror a Gitea release (with assets) to a GitHub repository
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ReleaseMirrorCli extends CliFramework
 {
@@ -201,7 +207,11 @@ class ReleaseMirrorCli extends CliFramework
             CURLOPT_HTTPHEADER => [
                 "Authorization: token {$token}",
                 'Accept: application/vnd.github+json',
-                'User-Agent: moko-platform',
+<<<<<<< HEAD
+                'User-Agent: MokoCLI',
+=======
+                'User-Agent: mokoplatform',
+>>>>>>> main
                 'Content-Type: application/json',
             ],
             CURLOPT_TIMEOUT => 30,
@@ -229,7 +239,11 @@ class ReleaseMirrorCli extends CliFramework
             CURLOPT_HTTPHEADER => [
                 "Authorization: token {$token}",
                 'Accept: application/vnd.github+json',
-                'User-Agent: moko-platform',
+<<<<<<< HEAD
+                'User-Agent: MokoCLI',
+=======
+                'User-Agent: mokoplatform',
+>>>>>>> main
                 'Content-Type: application/octet-stream',
             ],
             CURLOPT_POSTFIELDS => file_get_contents($filePath),

cli/release_notes.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/release_notes.php
  * BRIEF: Extract release notes from CHANGELOG.md for a given version
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ReleaseNotesCli extends CliFramework
 {

cli/release_package.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/release_package.php
  * BRIEF: Build packages (ZIP + tar.gz) with SHA-256 and upload to Gitea release
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\{CliFramework, SourceResolver};
 
 class ReleasePackageCli extends CliFramework
 {
@@ -99,9 +105,10 @@ class ReleasePackageCli extends CliFramework
         $extFolder = '';
         $typePrefix = '';
 
+        SourceResolver::warnIfLegacy($root);
         $manifestFiles = array_merge(
-            glob("{$root}/src/pkg_*.xml") ?: [],
+            SourceResolver::globSource($root, 'pkg_*.xml'),
-            glob("{$root}/src/*.xml") ?: [],
+            SourceResolver::globSource($root, '*.xml'),
             glob("{$root}/*.xml") ?: []
         );
 
@@ -200,14 +207,12 @@ class ReleasePackageCli extends CliFramework
             }
         }
 
-        if ($sourceDir === null && is_dir("{$root}/src")) {
+        if ($sourceDir === null) {
-            $sourceDir = "{$root}/src";
+            $sourceDir = SourceResolver::resolveAbsolute($root);
-        } elseif ($sourceDir === null && is_dir("{$root}/htdocs")) {
-            $sourceDir = "{$root}/htdocs";
         }
 
         if ($sourceDir === null) {
-            echo "No src/ or htdocs/ directory found — skipping package build\n";
+            echo "No source/ or src/ directory found — skipping package build\n";
             return 0;
         }
 
@@ -230,12 +235,32 @@ class ReleasePackageCli extends CliFramework
                 $subName = basename($pkgDir);
                 $subZipPath = "{$outputDir}/{$subName}.zip";
 
+                // If sub-package is a full repo checkout (e.g. git submodule),
+                // look for a source/ or src/ subdirectory containing a Joomla manifest XML
+                // and zip that instead of the repo root.
+                $subSourceDir = $pkgDir;
+                $subSrcAbs = SourceResolver::resolveAbsolute($pkgDir);
+                if ($subSrcAbs !== null) {
+                    $srcManifests = array_merge(
+                        glob("{$subSrcAbs}/*.xml") ?: [],
+                        glob("{$subSrcAbs}/pkg_*.xml") ?: []
+                    );
+                    foreach ($srcManifests as $mf) {
+                        if (strpos(file_get_contents($mf) ?: '', '<extension') !== false) {
+                            $subSourceDir = $subSrcAbs;
+                            $subSrcName = SourceResolver::resolve($pkgDir);
+                            echo "  Sub-package {$subName}: using {$subSrcName}/ entry-point\n";
+                            break;
+                        }
+                    }
+                }
+
                 $subZip = new \ZipArchive();
                 if ($subZip->open($subZipPath, \ZipArchive::CREATE | \ZipArchive::OVERWRITE) !== true) {
                     $this->log('ERROR', "Failed to create sub-package ZIP: {$subZipPath}");
                     continue;
                 }
-                $this->addDirToZip($subZip, $pkgDir, '', $this->excludePatterns);
+                $this->addDirToZip($subZip, $subSourceDir, '', $this->excludePatterns);
                 $subZip->close();
 
                 $zip->addFile($subZipPath, "packages/{$subName}.zip");

cli/release_promote.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/release_promote.php
  * BRIEF: Promote a Gitea release from one channel to another (rename release, tag, assets)
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\{CliFramework, SourceResolver};
 
 class ReleasePromoteCli extends CliFramework
 {
@@ -109,8 +115,8 @@ class ReleasePromoteCli extends CliFramework
         if ($to === 'stable') {
             $root = realpath($path) ?: $path;
             $manifestFiles = array_merge(
-                glob("{$root}/src/pkg_*.xml") ?: [],
+                SourceResolver::globSource($root, 'pkg_*.xml'),
-                glob("{$root}/src/*.xml") ?: [],
+                SourceResolver::globSource($root, '*.xml'),
                 glob("{$root}/*.xml") ?: []
             );
             foreach ($manifestFiles as $xmlFile) {

cli/release_publish.php

@@ -6,11 +6,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/release_publish.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/release_publish.php
+ * VERSION: 09.32.00
+>>>>>>> main
  * BRIEF: Publish a release and create copies for all lesser stability streams.
  */
 
@@ -18,7 +26,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ReleasePublishCli extends CliFramework
 {

cli/release_validate.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/release_validate.php
  * BRIEF: Pre-release validation -- version consistency, required files, manifest checks
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\{CliFramework, SourceResolver};
 
 class ReleaseValidateCli extends CliFramework
 {
@@ -66,8 +72,10 @@ class ReleaseValidateCli extends CliFramework
                 $platform = 'generic';
             }
         }
-        $hasSource = is_dir("{$root}/src") || is_dir("{$root}/htdocs");
+        $hasSource = SourceResolver::resolveAbsolute($root) !== null;
-        $this->addVResult('Source directory', $hasSource ? 'PASS' : 'WARN', $hasSource ? 'src/ or htdocs/ found' : 'No src/ or htdocs/ directory');
+        SourceResolver::warnIfLegacy($root);
+        $srcDirName = SourceResolver::resolve($root);
+        $this->addVResult('Source directory', $hasSource ? 'PASS' : 'WARN', $hasSource ? "{$srcDirName}/ found" : 'No source/ or src/ directory');
         if (!file_exists("{$root}/README.md")) {
             $this->addVResult('README.md', 'FAIL', 'Not found');
         } else {
@@ -109,7 +117,8 @@ class ReleaseValidateCli extends CliFramework
         $this->addVResult('LICENSE', $licenseFound ? 'PASS' : 'FAIL', $licenseFound ? 'Found' : 'Not found');
         if ($platform === 'joomla') {
             $manifest = null;
-            foreach (["{$root}/src", $root] as $dir) {
+            $srcAbs = SourceResolver::resolveAbsolute($root);
+            foreach (array_filter([$srcAbs, $root]) as $dir) {
                 if (!is_dir($dir)) {
                     continue;
                 } foreach (glob("{$dir}/*.xml") as $xmlFile) {
@@ -156,7 +165,7 @@ class ReleaseValidateCli extends CliFramework
             }
         } elseif ($platform === 'dolibarr') {
             $modFile = null;
-            foreach (['src', 'htdocs'] as $sd) {
+            foreach (SourceResolver::getCandidates() as $sd) {
                 $matches = glob("{$root}/{$sd}/mod*.class.php");
                 if (!empty($matches)) {
                     $modFile = $matches[0];

cli/release_verify.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/release_verify.php
  * BRIEF: Verify a built release artifact — version, SHA256, disallowed files
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ReleaseVerifyCli extends CliFramework
 {

cli/scaffold_client.php

@@ -8,11 +8,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/scaffold_client.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/scaffold_client.php
+ * VERSION: 09.32.00
+>>>>>>> main
  * BRIEF: Scaffold a new client-waas repo from Template-Client-WaaS with pre-configured settings
  */
 
@@ -20,7 +28,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class ScaffoldClientCli extends CliFramework
 {

cli/sync_rulesets.php

@@ -8,9 +8,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/sync_rulesets.php
  * BRIEF: Apply branch protection rules to all repos via platform adapter
  */
@@ -20,9 +26,9 @@ declare(strict_types=1);
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
-use MokoEnterprise\Config;
+use MokoCli\Config;
-use MokoEnterprise\PlatformAdapterFactory;
+use MokoCli\PlatformAdapterFactory;
 
 class SyncRulesetsCli extends CliFramework
 {
@@ -46,7 +52,11 @@ class SyncRulesetsCli extends CliFramework
         );
 
         $platformName  = $adapter->getPlatformName();
-        $ALWAYS_EXCLUDE = ['moko-platform', '.github-private'];
+<<<<<<< HEAD
+        $ALWAYS_EXCLUDE = ['MokoCLI', '.github-private'];
+=======
+        $ALWAYS_EXCLUDE = ['mokoplatform', '.github-private'];
+>>>>>>> main
 
         // -- Protection rules (platform-agnostic format) --
         $PROTECTIONS = [

cli/theme_lint.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/theme_lint.php
  * BRIEF: Lint theme files -- CSS syntax, image sizes, hardcoded URLs
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\{CliFramework, SourceResolver};
 
 class ThemeLintCli extends CliFramework
 {
@@ -41,17 +47,12 @@ class ThemeLintCli extends CliFramework
         $errors = 0;
         $warnings = 0;
 
-        $srcDir = null;
+        $srcDir = SourceResolver::resolveAbsolute($root);
-        foreach (['src', 'htdocs'] as $d) {
-            if (is_dir("{$root}/{$d}")) {
-                $srcDir = "{$root}/{$d}";
-                break;
-            }
-        }
         if ($srcDir === null) {
-            $this->log('ERROR', "No src/ or htdocs/ directory in {$root}");
+            $this->log('ERROR', "No source/ or src/ directory in {$root}");
             return 1;
         }
+        SourceResolver::warnIfLegacy($root);
 
         echo "Theme Lint: {$srcDir}\n\n";
 

cli/updates_xml_build.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/updates_xml_build.php
  * BRIEF: Generate Joomla updates.xml from extension manifest metadata
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\{CliFramework, SourceResolver};
 
 class UpdatesXmlBuildCli extends CliFramework
 {
@@ -109,7 +115,7 @@ class UpdatesXmlBuildCli extends CliFramework
         // -- Locate Joomla manifest ---------------------------------------------------
         $manifest = null;
 
-        $candidates = glob("{$root}/src/pkg_*.xml") ?: [];
+        $candidates = SourceResolver::globSource($root, 'pkg_*.xml');
         foreach ($candidates as $f) {
             if (strpos(file_get_contents($f), '<extension') !== false) {
                 $manifest = $f;

cli/updates_xml_sync.php

@@ -6,11 +6,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/updates_xml_sync.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/updates_xml_sync.php
+ * VERSION: 09.32.00
+>>>>>>> main
  * BRIEF: Sync updates.xml to target branches via Gitea API
  * NOTE: Called by pre-release and auto-release workflows after updates.xml
  *       is modified on the current branch. Pushes the file to other branches
@@ -21,7 +29,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class UpdatesXmlSyncCli extends CliFramework
 {

cli/version_auto_bump.php

@@ -6,11 +6,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/version_auto_bump.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/version_auto_bump.php
+ * VERSION: 09.32.00
+>>>>>>> main
  * BRIEF: Auto patch-bump, set stability suffix, and commit — single CLI replacing inline workflow bash
  */
 
@@ -18,7 +26,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\CliFramework;
 
 class VersionAutoBumpCli extends CliFramework
 {
@@ -109,10 +117,18 @@ class VersionAutoBumpCli extends CliFramework
             echo "{$line}\n";
         }
 
-        // Step 2: Read version
+        // Step 2: Read version (--quiet suppresses banner so only the version is output)
         $versionOutput = [];
-        exec("{$php} {$cli}/version_read.php --path " . escapeshellarg($path) . " 2>&1", $versionOutput, $versionRc);
+        exec("{$php} {$cli}/version_read.php --path " . escapeshellarg($path) . " --quiet 2>&1", $versionOutput, $versionRc);
-        $version = trim($versionOutput[0] ?? '');
+        // Take the last non-empty line — the version is always the final output
+        $version = '';
+        foreach (array_reverse($versionOutput) as $line) {
+            $line = trim($line);
+            if (preg_match('/^\d{2}\.\d{2}\.\d{2}/', $line)) {
+                $version = $line;
+                break;
+            }
+        }
 
         if (empty($version)) {
             echo "No version found — skipping\n";

cli/version_bump.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/version_bump.php
  * BRIEF: Auto-increment version -- manifest.xml is canonical, cascades to all XML and MD files
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\{CliFramework, SourceResolver};
 
 class VersionBumpCli extends CliFramework
 {
@@ -27,6 +33,7 @@ class VersionBumpCli extends CliFramework
         $this->addArgument('--path', 'Repository root', '.');
         $this->addArgument('--minor', 'Bump minor version', false);
         $this->addArgument('--major', 'Bump major version', false);
+        $this->addArgument('--min-version', 'Minimum base version (ensures bump is above this)', '');
     }
 
     protected function run(): int
@@ -42,6 +49,7 @@ class VersionBumpCli extends CliFramework
         $root = realpath($path) ?: $path;
         $mokoVersion = null;
         $existingSuffix = '';
+        $versionPrefix = '';
         $mokoManifest = "{$root}/.mokogitea/manifest.xml";
         $mokoContent = '';
         if (file_exists($mokoManifest)) {
@@ -50,29 +58,58 @@ class VersionBumpCli extends CliFramework
                 $mokoVersion = $m[1];
                 $existingSuffix = $m[2] ?? '';
             }
+            // Read version_prefix from manifest.xml (supports nested and flat structure)
+            $xml = @simplexml_load_file($mokoManifest);
+            if ($xml !== false) {
+                $prefix = (string)($xml->identity->version_prefix ?? '');
+                if ($prefix === '') {
+                    $prefix = (string)($xml->version_prefix ?? '');
+                }
+                $versionPrefix = $prefix;
+            }
         }
         $readmeVersion = null;
         $readme = "{$root}/README.md";
         $readmeContent = '';
         if (file_exists($readme)) {
             $readmeContent = file_get_contents($readme);
-            if (preg_match('/VERSION:\s*(\d{2}\.\d{2}\.\d{2})/m', $readmeContent, $m)) {
+            if (!empty($versionPrefix)) {
+                // Prefix-aware README scan
+                $prefixPattern = preg_quote($versionPrefix, '/');
+                if (preg_match('/' . $prefixPattern . '(\d{2}\.\d{2}\.\d{2})/m', $readmeContent, $m)) {
+                    $readmeVersion = $m[1];
+                }
+            }
+            if ($readmeVersion === null && preg_match('/VERSION:\s*(\d{2}\.\d{2}\.\d{2})/m', $readmeContent, $m)) {
                 $readmeVersion = $m[1];
             }
         }
         $manifestVersion = null;
+        SourceResolver::warnIfLegacy($root);
         $manifestFiles = array_merge(
-            glob("{$root}/src/pkg_*.xml") ?: [],
+            SourceResolver::globSource($root, 'pkg_*.xml'),
-            glob("{$root}/src/*.xml") ?: [],
+            SourceResolver::globSource($root, '*.xml'),
-            glob("{$root}/src/packages/*/mokowaas.xml") ?: [],
+            SourceResolver::globSource($root, 'packages/*/mokowaas.xml'),
-            glob("{$root}/src/packages/*/*.xml") ?: [],
+            SourceResolver::globSource($root, 'packages/*/*.xml'),
             glob("{$root}/*.xml") ?: []
         );
         foreach ($manifestFiles as $xmlFile) {
             $xmlContent = file_get_contents($xmlFile);
             if (strpos($xmlContent, '<extension') === false && strpos($xmlContent, '<version>') === false) {
                 continue;
-            } if (preg_match('#<version>(\d{2}\.\d{2}\.\d{2})((?:-(?:dev|alpha|beta|rc))+)?</version>#', $xmlContent, $xm)) {
+            }
+            if (!empty($versionPrefix)) {
+                // Prefix-aware: look for <version>prefix + XX.YY.ZZ</version>
+                $prefixPattern = preg_quote($versionPrefix, '#');
+                if (preg_match('#<version>' . $prefixPattern . '(\d{2}\.\d{2}\.\d{2})</version>#', $xmlContent, $xm)) {
+                    $candidate = $xm[1];
+                    if ($manifestVersion === null || version_compare($candidate, $manifestVersion, '>')) {
+                        $manifestVersion = $candidate;
+                    }
+                    continue;
+                }
+            }
+            if (preg_match('#<version>(\d{2}\.\d{2}\.\d{2})((?:-(?:dev|alpha|beta|rc))+)?</version>#', $xmlContent, $xm)) {
                 $candidate = $xm[1];
                 if ($manifestVersion === null || version_compare($candidate, $manifestVersion, '>')) {
                     $manifestVersion = $candidate;
@@ -86,6 +123,28 @@ class VersionBumpCli extends CliFramework
                 $baseVersion = $v;
             }
         }
+
+        // Check --min-version: ensures dev never falls behind stable
+        $minVersion = $this->getArgument('--min-version');
+        if (!empty($minVersion)) {
+            $minVersion = preg_replace('/-(?:dev|alpha|beta|rc)$/', '', $minVersion);
+            if (preg_match('/^\d{2}\.\d{2}\.\d{2}$/', $minVersion)) {
+                if ($baseVersion === null || version_compare($minVersion, $baseVersion, '>')) {
+                    $this->log('INFO', "Using --min-version {$minVersion} (higher than manifest {$baseVersion})");
+                    $baseVersion = $minVersion;
+                }
+            }
+        }
+
+        // Auto-detect: scan git tags for higher versions from other channels
+        if ($baseVersion !== null) {
+            $gitTagVersion = $this->getHighestGitTagVersion($root);
+            if ($gitTagVersion !== null && version_compare($gitTagVersion, $baseVersion, '>')) {
+                $this->log('INFO', "Git tag version {$gitTagVersion} is higher than manifest {$baseVersion} — using as base");
+                $baseVersion = $gitTagVersion;
+            }
+        }
+
         if ($baseVersion === null) {
             $this->log('ERROR', "No version found in manifest.xml, README.md, or Joomla XML");
             return 1;
@@ -135,25 +194,43 @@ class VersionBumpCli extends CliFramework
             }
         }
         if (file_exists($readme) && !empty($readmeContent)) {
-            $updated = preg_replace('/(VERSION:\s*)\d{2}\.\d{2}\.\d{2}(?:(?:-(?:dev|alpha|beta|rc))+)?/m', '${1}' . $newBase, $readmeContent, 1);
+            if (!empty($versionPrefix)) {
+                // Prefix-aware README replacement: preserve prefix, replace only version part
+                $prefixPattern = preg_quote($versionPrefix, '/');
+                $updated = preg_replace('/(' . $prefixPattern . ')\d{2}\.\d{2}\.\d{2}/m', '${1}' . $newBase, $readmeContent, 1);
+            } else {
+                $updated = preg_replace('/(VERSION:\s*)\d{2}\.\d{2}\.\d{2}(?:(?:-(?:dev|alpha|beta|rc))+)?/m', '${1}' . $newBase, $readmeContent, 1);
+            }
             if ($updated !== null) {
                 file_put_contents($readme, $updated);
             }
         }
         $updatedFiles = [];
-        foreach (["{$root}/src/pkg_*.xml", "{$root}/src/*.xml", "{$root}/src/packages/*/*.xml", "{$root}/*.xml"] as $pattern) {
+        $srcName = SourceResolver::resolve($root);
+        foreach (["{$root}/{$srcName}/pkg_*.xml", "{$root}/{$srcName}/*.xml", "{$root}/{$srcName}/packages/*/*.xml", "{$root}/*.xml"] as $pattern) {
             foreach (glob($pattern) ?: [] as $xmlFile) {
                 $content = file_get_contents($xmlFile);
                 if (strpos($content, '<extension') === false) {
                     continue;
                 }
-                $xmlPattern = '#<version>\d{2}\.\d{2}\.\d{2}'
+                if (!empty($versionPrefix)) {
-                    . '(?:(?:-(?:dev|alpha|beta|rc))+)?</version>#';
+                    // Prefix-aware: preserve prefix, replace only the Moko version part
-                $newContent = preg_replace(
+                    $prefixPattern = preg_quote($versionPrefix, '#');
-                    $xmlPattern,
+                    $xmlPattern = '#(<version>' . $prefixPattern . ')\d{2}\.\d{2}\.\d{2}</version>#';
-                    "<version>{$newFull}</version>",
+                    $newContent = preg_replace(
-                    $content
+                        $xmlPattern,
-                );
+                        '${1}' . $newBase . '</version>',
+                        $content
+                    );
+                } else {
+                    $xmlPattern = '#<version>\d{2}\.\d{2}\.\d{2}'
+                        . '(?:(?:-(?:dev|alpha|beta|rc))+)?</version>#';
+                    $newContent = preg_replace(
+                        $xmlPattern,
+                        "<version>{$newFull}</version>",
+                        $content
+                    );
+                }
                 if ($newContent !== null && $newContent !== $content) {
                     file_put_contents($xmlFile, $newContent);
                     $updatedFiles[] = substr($xmlFile, strlen($root) + 1);
@@ -166,28 +243,66 @@ class VersionBumpCli extends CliFramework
         $packageJsonFile = "{$root}/package.json";
         if (file_exists($packageJsonFile)) {
             $pkgContent = file_get_contents($packageJsonFile);
-            $pkgPattern = '/("version"\s*:\s*")\d{2}\.\d{2}\.\d{2}'
+            if (!empty($versionPrefix)) {
-                . '(?:(?:-(?:dev|alpha|beta|rc))+)?(")/m';
+                // Prefix-aware package.json replacement
-            $updatedPkg = preg_replace(
+                $prefixPattern = preg_quote($versionPrefix, '/');
-                $pkgPattern,
+                $pkgPattern = '/("version"\s*:\s*")' . $prefixPattern . '\d{2}\.\d{2}\.\d{2}(")/m';
-                '${1}' . $newFull . '${2}',
+                $updatedPkg = preg_replace(
-                $pkgContent
+                    $pkgPattern,
-            );
+                    '${1}' . $versionPrefix . $newBase . '${2}',
-            if ($updatedPkg !== $pkgContent) {
+                    $pkgContent
+                );
+            } else {
+                $pkgPattern = '/("version"\s*:\s*")\d{2}\.\d{2}\.\d{2}'
+                    . '(?:(?:-(?:dev|alpha|beta|rc))+)?(")/m';
+                $updatedPkg = preg_replace(
+                    $pkgPattern,
+                    '${1}' . $newFull . '${2}',
+                    $pkgContent
+                );
+            }
+            if ($updatedPkg !== $pkgContent && $updatedPkg !== null) {
                 file_put_contents($packageJsonFile, $updatedPkg);
                 fwrite(STDERR, "Updated package.json\n");
+            } elseif (preg_match('/("version"\s*:\s*")(\d+)\.(\d+)\.(\d+)(")/m', $pkgContent, $semM)) {
+                // Semver fallback: bump standard x.y.z version when XX.YY.ZZ pattern didn't match
+                $sMajor = (int)$semM[2];
+                $sMinor = (int)$semM[3];
+                $sPatch = (int)$semM[4];
+                switch ($type) {
+                    case 'major': $sMajor++; $sMinor = 0; $sPatch = 0; break;
+                    case 'minor': $sMinor++; $sPatch = 0; break;
+                    default: $sPatch++; break;
+                }
+                $semNew = "{$sMajor}.{$sMinor}.{$sPatch}";
+                $semUpdated = preg_replace('/("version"\s*:\s*")\d+\.\d+\.\d+(")/m', '${1}' . $semNew . '${2}', $pkgContent);
+                if ($semUpdated !== $pkgContent) {
+                    file_put_contents($packageJsonFile, $semUpdated);
+                    fwrite(STDERR, "Updated package.json (semver: {$semM[2]}.{$semM[3]}.{$semM[4]} -> $semNew)\n");
+                }
             }
         }
         $pyprojectFile = "{$root}/pyproject.toml";
         if (file_exists($pyprojectFile)) {
             $pyContent = file_get_contents($pyprojectFile);
-            $pyPattern = '/^(version\s*=\s*")\d{2}\.\d{2}\.\d{2}'
+            if (!empty($versionPrefix)) {
-                . '(?:(?:-(?:dev|alpha|beta|rc))+)?(")/m';
+                // Prefix-aware pyproject.toml replacement
-            $updatedPy = preg_replace(
+                $prefixPattern = preg_quote($versionPrefix, '/');
-                $pyPattern,
+                $pyPattern = '/^(version\s*=\s*")' . $prefixPattern . '\d{2}\.\d{2}\.\d{2}(")/m';
-                '${1}' . $newFull . '${2}',
+                $updatedPy = preg_replace(
-                $pyContent
+                    $pyPattern,
-            );
+                    '${1}' . $versionPrefix . $newBase . '${2}',
+                    $pyContent
+                );
+            } else {
+                $pyPattern = '/^(version\s*=\s*")\d{2}\.\d{2}\.\d{2}'
+                    . '(?:(?:-(?:dev|alpha|beta|rc))+)?(")/m';
+                $updatedPy = preg_replace(
+                    $pyPattern,
+                    '${1}' . $newFull . '${2}',
+                    $pyContent
+                );
+            }
             if ($updatedPy !== $pyContent) {
                 file_put_contents($pyprojectFile, $updatedPy);
                 fwrite(STDERR, "Updated pyproject.toml\n");
@@ -204,7 +319,13 @@ class VersionBumpCli extends CliFramework
         }
         $scanExtensions = ['php', 'yml', 'yaml', 'md', 'txt', 'xml', 'sh', 'toml', 'ini', 'css', 'js'];
         $excludeDirs = ['.git', 'vendor', 'node_modules', 'build', 'dist', '.claude'];
-        $versionPattern = '/(VERSION:\s*)\d{2}\.\d{2}\.\d{2}/m';
+        // Build the generic VERSION: pattern — prefix-aware if configured
+        if (!empty($versionPrefix)) {
+            $prefixPatternGeneric = preg_quote($versionPrefix, '/');
+            $versionPattern = '/(' . $prefixPatternGeneric . ')\d{2}\.\d{2}\.\d{2}/m';
+        } else {
+            $versionPattern = '/(VERSION:\s*)\d{2}\.\d{2}\.\d{2}/m';
+        }
         $directory = new RecursiveDirectoryIterator($root, RecursiveDirectoryIterator::SKIP_DOTS);
         $filter = new RecursiveCallbackFilterIterator($directory, function ($current, $key, $iterator) use ($excludeDirs) {
             if ($current->isDir() && in_array($current->getFilename(), $excludeDirs, true)) {
@@ -251,6 +372,54 @@ class VersionBumpCli extends CliFramework
         echo "{$old} -> {$newFull}\n";
         return 0;
     }
+
+    /**
+     * Scan git release tags for the highest version across all channels.
+     *
+     * Checks release names like "MokoSuiteClient (VERSION: 02.45.00)" in
+     * git tags (stable, release-candidate, development, etc.) to find the
+     * highest version that has been released on any channel.
+     */
+    private function getHighestGitTagVersion(string $root): ?string
+    {
+        $highest = null;
+
+        // Method 1: Parse version from git tag annotations / release commit messages
+        $output = [];
+        exec("cd " . escapeshellarg($root) . " && git log --all --oneline --grep='chore(version)' --grep='chore(release)' --format='%s' -20 2>/dev/null", $output);
+
+        foreach ($output as $line) {
+            if (preg_match('/(\d{2}\.\d{2}\.\d{2})/', $line, $m)) {
+                $v = preg_replace('/-(?:dev|alpha|beta|rc)$/', '', $m[1]);
+                if ($highest === null || version_compare($v, $highest, '>')) {
+                    $highest = $v;
+                }
+            }
+        }
+
+        // Method 2: Check version in remote branches' manifest files
+        $branches = ['origin/main', 'origin/rc', 'origin/dev'];
+        $manifestPaths = ['source/pkg_*.xml', 'pkg_*.xml'];
+
+        foreach ($branches as $branch) {
+            foreach ($manifestPaths as $pattern) {
+                $files = [];
+                exec("cd " . escapeshellarg($root) . " && git ls-tree --name-only {$branch} -- '{$pattern}' 2>/dev/null", $files);
+
+                foreach ($files as $file) {
+                    $content = shell_exec("cd " . escapeshellarg($root) . " && git show {$branch}:{$file} 2>/dev/null");
+                    if ($content && preg_match('#<version>(\d{2}\.\d{2}\.\d{2})(?:-(?:dev|alpha|beta|rc))?</version>#', $content, $m)) {
+                        $v = $m[1];
+                        if ($highest === null || version_compare($v, $highest, '>')) {
+                            $highest = $v;
+                        }
+                    }
+                }
+            }
+        }
+
+        return $highest;
+    }
 }
 
 $app = new VersionBumpCli();

cli/version_bump_remote.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/version_bump_remote.php
  * BRIEF: Bump version in manifest XML and CHANGELOG.md on a remote branch via Gitea API
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\{CliFramework, SourceResolver};
 
 class VersionBumpRemoteCli extends CliFramework
 {
@@ -104,11 +110,15 @@ class VersionBumpRemoteCli extends CliFramework
         $nextVersion = sprintf('%02d.%02d.%02d', $major, $minor, $patch);
         echo "{$version} -> {$nextVersion} ({$branch})\n";
 
+        // Try both source/ and src/ paths for backwards compatibility with remote repos
         $manifestPaths = [];
-        if ($manifestFile !== null) {
+        foreach (['source', 'src'] as $srcPrefix) {
-            $manifestPaths[] = "src/{$manifestFile}";
+            if ($manifestFile !== null) {
+                $manifestPaths[] = "{$srcPrefix}/{$manifestFile}";
+            }
+            $manifestPaths[] = "{$srcPrefix}/templateDetails.xml";
+            $manifestPaths[] = "{$srcPrefix}/manifest.xml";
         }
-        $manifestPaths = array_merge($manifestPaths, ['src/templateDetails.xml', 'src/manifest.xml']);
         $manifestUpdated = false;
         foreach ($manifestPaths as $mPath) {
             $result = $this->updateRemoteFile($apiBase, $token, $mPath, $branch, function (string $content) use ($version, $nextVersion): string {

cli/version_check.php

@@ -6,11 +6,19 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/version_check.php
- * VERSION: 09.23.00
+ * VERSION: 09.25.05
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+ * PATH: /cli/version_check.php
+ * VERSION: 09.32.00
+>>>>>>> main
  * BRIEF: Validate version consistency across README, manifests, and sub-packages
  */
 
@@ -18,7 +26,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\{CliFramework, SourceResolver};
 
 class VersionCheckCli extends CliFramework
 {
@@ -77,7 +85,8 @@ class VersionCheckCli extends CliFramework
                 $versions['pyproject.toml'] = $m[1];
             }
         }
-        foreach (["{$root}/src/pkg_*.xml", "{$root}/src/*.xml", "{$root}/src/packages/*/*.xml", "{$root}/*.xml"] as $glob) {
+        $srcName = SourceResolver::resolve($root);
+        foreach (["{$root}/{$srcName}/pkg_*.xml", "{$root}/{$srcName}/*.xml", "{$root}/{$srcName}/packages/*/*.xml", "{$root}/*.xml"] as $glob) {
             foreach (glob($glob) ?: [] as $file) {
                 if (basename($file) === 'updates.xml') {
                     continue;

cli/version_read.php

@@ -6,9 +6,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * FILE INFORMATION
- * DEFGROUP: moko-platform.CLI
+<<<<<<< HEAD
- * INGROUP: moko-platform
+ * DEFGROUP: MokoCLI.CLI
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+ * INGROUP: MokoCLI
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+=======
+ * DEFGROUP: mokoplatform.CLI
+ * INGROUP: mokoplatform
+ * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
+>>>>>>> main
  * PATH: /cli/version_read.php
  * BRIEF: Read version — manifest.xml is canonical, falls back to README.md and Joomla XML
  */
@@ -17,7 +23,7 @@ declare(strict_types=1);
 
 require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
 
-use MokoEnterprise\CliFramework;
+use MokoCli\{CliFramework, SourceResolver};
 
 class VersionReadCli extends CliFramework
 {
@@ -34,6 +40,7 @@ class VersionReadCli extends CliFramework
 
         // -- 1. Read from .mokogitea/manifest.xml (canonical source) --
         $mokoVersion = null;
+        $versionPrefix = '';
         $mokoManifest = "{$root}/.mokogitea/manifest.xml";
         if (file_exists($mokoManifest)) {
             $xml = @simplexml_load_file($mokoManifest);
@@ -42,6 +49,12 @@ class VersionReadCli extends CliFramework
                 if (preg_match('/^\d{2}\.\d{2}\.\d{2}((?:-(?:dev|alpha|beta|rc))+)?$/', $v)) {
                     $mokoVersion = $v;
                 }
+                // Read version_prefix (supports both nested and flat structure)
+                $prefix = (string)($xml->identity->version_prefix ?? '');
+                if ($prefix === '') {
+                    $prefix = (string)($xml->version_prefix ?? '');
+                }
+                $versionPrefix = $prefix;
             }
         }
 
@@ -56,7 +69,14 @@ class VersionReadCli extends CliFramework
         $readme = "{$root}/README.md";
         if (file_exists($readme)) {
             $content = file_get_contents($readme);
-            if (preg_match('/VERSION:\s*(\d{2}\.\d{2}\.\d{2})/m', $content, $m)) {
+            if (!empty($versionPrefix)) {
+                // Prefix-aware: search for prefix followed by version
+                $prefixPattern = preg_quote($versionPrefix, '/');
+                if (preg_match('/' . $prefixPattern . '(\d{2}\.\d{2}\.\d{2})/m', $content, $m)) {
+                    $readmeVersion = $m[1];
+                }
+            }
+            if ($readmeVersion === null && preg_match('/VERSION:\s*(\d{2}\.\d{2}\.\d{2})/m', $content, $m)) {
                 $readmeVersion = $m[1];
             }
         }
@@ -64,9 +84,9 @@ class VersionReadCli extends CliFramework
         // -- 3. Fallback: Joomla manifest XML --
         $manifestVersion = null;
         $manifestFiles = array_merge(
-            glob("{$root}/src/pkg_*.xml") ?: [],
+            SourceResolver::globSource($root, 'pkg_*.xml'),
-            glob("{$root}/src/*.xml") ?: [],
+            SourceResolver::globSource($root, '*.xml'),
-            glob("{$root}/src/packages/*/*.xml") ?: [],
+            SourceResolver::globSource($root, 'packages/*/*.xml'),
             glob("{$root}/*.xml") ?: []
         );
 
@@ -75,10 +95,22 @@ class VersionReadCli extends CliFramework
             if (strpos($xmlContent, '<extension') === false && strpos($xmlContent, '<version>') === false) {
                 continue;
             }
+            if (!empty($versionPrefix)) {
+                // Prefix-aware: look for <version>prefix + XX.YY.ZZ</version>
+                $prefixPattern = preg_quote($versionPrefix, '#');
+                if (preg_match('#<version>' . $prefixPattern . '(\d{2}\.\d{2}\.\d{2})</version>#', $xmlContent, $xm)) {
+                    $candidate = $xm[1];
+                    $currentBase = $manifestVersion ? preg_replace('/(-(?:dev|alpha|beta|rc))+$/', '', $manifestVersion) : null;
+                    if ($currentBase === null || version_compare($candidate, $currentBase, '>')) {
+                        $manifestVersion = $candidate;
+                    }
+                    continue;
+                }
+            }
             if (preg_match('#<version>(\d{2}\.\d{2}\.\d{2}(?:(?:-(?:dev|alpha|beta|rc))+)?)</version>#', $xmlContent, $xm)) {
                 $candidate = $xm[1];
-                $candidateBase = preg_replace('/(-(dev|alpha|beta|rc))+$/', '', $candidate);
+                $candidateBase = preg_replace('/(-(?:dev|alpha|beta|rc))+$/', '', $candidate);
-                $currentBase = $manifestVersion ? preg_replace('/(-(dev|alpha|beta|rc))+$/', '', $manifestVersion) : null;
+                $currentBase = $manifestVersion ? preg_replace('/(-(?:dev|alpha|beta|rc))+$/', '', $manifestVersion) : null;
                 if ($currentBase === null || version_compare($candidateBase, $currentBase, '>')) {
                     $manifestVersion = $candidate;
                 }