chore(version): auto-bump patch 09.34.01-dev [skip ci]

fix(version-bump): prevent dev from falling behind stable (#289 )
Cherry-pick from dev (d5fa609). version_bump.php now checks: 1. --min-version argument from workflow 2. Auto-detect from git — scans origin/main and origin/rc for highest released version and uses it as the bump base Closes #289
2026-06-21 02:52:39 +00:00 · 2026-06-20 21:49:17 -05:00
38 changed files with 109 additions and 38 deletions
@@ -5,7 +5,7 @@
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Automation
-# VERSION: 09.34.00
+# VERSION: 09.34.01
 # BRIEF: Auto-create feature branch when an issue is opened

 name: "Universal: Issue Branch"
@@ -6,7 +6,7 @@ DEFGROUP: MokoPlatform.Root
 INGROUP: MokoPlatform
 REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 PATH: /README.md
-VERSION: 09.34.00
+VERSION: 09.34.01
 BRIEF: Project overview and documentation
 -->

@@ -13,7 +13,7 @@
 * INGROUP: MokoPlatform.Scripts
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 * PATH: /automation/update_dependencies.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Cross-repo dependency update automation — scan, update, PR, auto-merge
 */

@@ -10,7 +10,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/branch_rename.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Rename a git branch via Gitea API (create new, update PR, delete old)
 */

@@ -12,7 +12,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/bulk_workflow_push.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Push a workflow file to all governed repos via the Gitea Contents API
 */

@@ -12,7 +12,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/bulk_workflow_trigger.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Trigger a workflow across multiple repos at once
 */

@@ -12,7 +12,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/client_dashboard.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Generate unified client dashboard HTML
 */

@@ -12,7 +12,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/client_inventory.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Discover and list all client-waas repos with their server configuration status
 */

@@ -12,7 +12,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/client_provision.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Provision a new client environment end-to-end
 */

@@ -12,7 +12,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/grafana_dashboard.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Manage Grafana dashboards via API
 */

@@ -10,7 +10,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/joomla_build.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Build a Joomla extension ZIP from manifest — all types supported
 * NOTE: Called by pre-release and auto-release workflows.
 */
@@ -10,7 +10,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/joomla_metadata_validate.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Validate MokoGitea repo metadata against Joomla extension manifest XML
 */

@@ -10,7 +10,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/manifest_detect.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Auto-detect manifest fields from source files and optionally push to API
 */

@@ -10,7 +10,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/manifest_integrity.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Cross-check manifest API fields against repo contents across the org
 */

@@ -10,7 +10,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/manifest_licensing.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Ensure licensing tags (updateservers, dlid) in Joomla extension manifests
 */

@@ -10,7 +10,7 @@
 * INGROUP: mokocli
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 * PATH: /cli/manifest_read.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Read repo metadata from Gitea manifest API, auto-detect the rest
 */

@@ -10,7 +10,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/platform_detect.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Auto-detect repository platform type and optionally update manifest
 */

@@ -10,7 +10,7 @@
 * INGROUP: mokocli
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 * PATH: /cli/release_cascade.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Cascade release zip to all lower stability channels
 */

@@ -10,7 +10,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/release_publish.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Publish a release and create copies for all lesser stability streams.
 */

@@ -12,7 +12,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/scaffold_client.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Scaffold a new client-waas repo from Template-Client-WaaS with pre-configured settings
 */

@@ -10,7 +10,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/updates_xml_sync.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * 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
@@ -10,7 +10,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/version_auto_bump.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Auto patch-bump, set stability suffix, and commit — single CLI replacing inline workflow bash
 */

@@ -27,6 +27,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
@@ -116,6 +117,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;
@@ -343,6 +366,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: 09.34.01)" 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();
@@ -10,7 +10,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/version_check.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Validate version consistency across README, manifests, and sub-packages
 */

@@ -10,7 +10,7 @@
 * INGROUP: mokoplatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /cli/wiki_sync.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Sync select wiki pages from mokoplatform to all template repos
 */

@@ -10,7 +10,7 @@
 * INGROUP: moko-platform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
 * PATH: /cli/workflow_sync.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Sync workflows from Generic → platform templates → live repos based on manifest.platform
 */

@@ -12,7 +12,7 @@
 * INGROUP: MokoPlatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /deploy/backup-before-deploy.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Snapshot Joomla directories before deployment for rollback capability
 */

@@ -12,7 +12,7 @@
 * INGROUP: MokoPlatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /deploy/deploy-dolibarr.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Deploy Dolibarr module files to a remote server via SFTP/rsync
 */

@@ -12,7 +12,7 @@
 * INGROUP: MokoPlatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /deploy/health-check.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Post-deploy health check — verify a Joomla site is responding correctly
 */

@@ -12,7 +12,7 @@
 * INGROUP: MokoPlatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /deploy/rollback-joomla.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Rollback a Joomla deployment by restoring from a pre-deploy snapshot
 */

@@ -12,7 +12,7 @@
 * INGROUP: MokoPlatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /deploy/sync-joomla.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Sync Joomla site directories between two servers via rsync over SSH
 */

@@ -14,7 +14,7 @@
 	DEFGROUP: dolibarr-api-mcp.Documentation
 	INGROUP: dolibarr-api-mcp
 	REPO: https://git.mokoconsulting.tech/MokoConsulting/dolibarr-api-mcp
-	VERSION: 09.34.00
+	VERSION: 09.34.01
 	PATH: ./CONTRIBUTING.md
 	BRIEF: Contribution guidelines for the project
 -->
@@ -10,7 +10,7 @@ DEFGROUP: dolibarr-api-mcp.Documentation
 INGROUP: dolibarr-api-mcp
 REPO: https://git.mokoconsulting.tech/MokoConsulting/dolibarr-api-mcp
 PATH: /SECURITY.md
-VERSION: 09.34.00
+VERSION: 09.34.01
 BRIEF: Security vulnerability reporting and handling policy
 -->

@@ -14,7 +14,7 @@
 	DEFGROUP: 
 	INGROUP: Project.Documentation
 	REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoCli-Template-Generic
-	VERSION: 09.34.00
+	VERSION: 09.34.01
 	PATH: ./CONTRIBUTING.md
 	BRIEF: Contribution guidelines for the project
 -->
@@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME]
 INGROUP: [PROJECT_NAME].Documentation
 REPO: [REPOSITORY_URL]
 PATH: /SECURITY.md
-VERSION: 09.34.00
+VERSION: 09.34.01
 BRIEF: Security vulnerability reporting and handling policy
 -->

@@ -63,7 +63,7 @@ class VersionBumpTest extends TestCase
    {
        file_put_contents(
            "{$this->tmpDir}/README.md",
-            "<!-- VERSION: 09.34.00 -->\nSome content\n"
+            "<!-- VERSION: 09.34.01 -->\nSome content\n"
        );

        $this->execute();
@@ -34,7 +34,7 @@ class VersionReadTest extends TestCase
    {
        file_put_contents(
            "{$this->tmpDir}/README.md",
-            "# Test\n<!-- VERSION: 09.34.00 -->\n"
+            "# Test\n<!-- VERSION: 09.34.01 -->\n"
        );

        $this->assertSame('02.03.04', trim($this->runScript()));
@@ -68,7 +68,7 @@ class VersionReadTest extends TestCase
    {
        file_put_contents(
            "{$this->tmpDir}/README.md",
-            "<!-- VERSION: 09.34.00 -->\n"
+            "<!-- VERSION: 09.34.01 -->\n"
        );
        mkdir("{$this->tmpDir}/src", 0755, true);
        file_put_contents(
@@ -12,7 +12,7 @@
 * INGROUP: MokoPlatform
 * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
 * PATH: /validate/check_file_integrity.php
- * VERSION: 09.34.00
+ * VERSION: 09.34.01
 * BRIEF: Compare deployed files on a remote server against the local repository to detect drift
 */
Author	SHA1	Message	Date
gitea-actions[bot]	252e5ef3fb	chore(version): auto-bump patch 09.34.01-dev [skip ci]	2026-06-21 02:52:39 +00:00
Jonathan Miller	e7b2c1fba2	fix(version-bump): prevent dev from falling behind stable (#289 ) Platform: mokoplatform CI / Gate 2: Unit Tests (8.1) (pull_request) Blocked by required conditions Details Platform: mokoplatform CI / Gate 2: Unit Tests (8.2) (pull_request) Blocked by required conditions Details Platform: mokoplatform CI / Gate 2: Unit Tests (8.3) (pull_request) Blocked by required conditions Details Platform: mokoplatform CI / Gate 3: Self-Health Check (pull_request) Blocked by required conditions Details Platform: mokoplatform CI / Gate 4: Governance (pull_request) Blocked by required conditions Details Platform: mokoplatform CI / Gate 5: Template Integrity (pull_request) Blocked by required conditions Details Platform: mokoplatform CI / CI Summary (pull_request) Blocked by required conditions Details Universal: PR Check / Build RC Package (pull_request) Blocked by required conditions Details Universal: PR Check / Report Issues (pull_request) Blocked by required conditions Details Generic: Repo Health / Scripts governance (pull_request) Blocked by required conditions Details Generic: Repo Health / Repository health (pull_request) Blocked by required conditions Details Generic: Repo Health / Report Issues (pull_request) Blocked by required conditions Details Universal: PR Check / Branch Policy (pull_request) Failing after 1s Details Generic: Repo Health / Access control (pull_request) Successful in 1s Details Generic: Repo Health / Site Health (pull_request) Has been skipped Details Universal: PR Check / Validate PR (pull_request) Failing after 6s Details Universal: PR Check / Secret Scan (pull_request) Successful in 8s Details Branch Cleanup / Delete merged branch (pull_request) Successful in 2s Details RC Revert / Rename rc/ back to dev/ (pull_request) Has been skipped Details Platform: mokoplatform CI / Gate 1: Code Quality (pull_request) Failing after 1m6s Details Universal: Workflow Sync Trigger / Sync workflows to live repos (pull_request) Failing after 2m2s Details Universal: Auto Version Bump / Version Bump (push) Successful in 11s Details Universal: Build & Release / Promote to RC (pull_request) Has been skipped Details Universal: Build & Release / Build & Release Pipeline (pull_request) Successful in 28s Details Cherry-pick from dev (`d5fa609`). version_bump.php now checks: 1. --min-version argument from workflow 2. Auto-detect from git — scans origin/main and origin/rc for highest released version and uses it as the bump base Closes #289	2026-06-20 21:49:17 -05:00