fix(version): preserve suffix on bump, simplify workflow version logic (#191)

version_bump.php now captures the existing suffix (e.g. -dev) from
manifest.xml and re-applies it after incrementing the base version.
This lets workflows read the version as-is instead of stripping and
re-applying suffixes based on branch names.

Simplified update-server.yml and pre-release.yml by removing the
strip→map→re-apply suffix dance. Removed DISPLAY_VERSION and SUFFIX
output variables — VERSION now carries the full suffixed string.

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

cli/updates_xml_build.php

@@ -52,7 +52,7 @@ class UpdatesXmlBuildCli extends CliFramework
             return 1;
         }
 
-        // Strip any existing stability suffix from version
+        // Strip suffix — stability is applied via --stability parameter
         $version = preg_replace('/-(dev|alpha|beta|rc)$/', '', $version);
 
         $root = realpath($path) ?: $path;

cli/version_bump.php

@@ -41,12 +41,14 @@ class VersionBumpCli extends CliFramework
         }
         $root = realpath($path) ?: $path;
         $mokoVersion = null;
+        $existingSuffix = '';
         $mokoManifest = "{$root}/.mokogitea/manifest.xml";
         $mokoContent = '';
         if (file_exists($mokoManifest)) {
             $mokoContent = file_get_contents($mokoManifest);
-            if (preg_match('#<version>(\d{2}\.\d{2}\.\d{2})(?:-((?:(?:dev|alpha|beta|rc)-?)+))?</version>#', $mokoContent, $m)) {
+            if (preg_match('#<version>(\d{2}\.\d{2}\.\d{2})((?:-(?:dev|alpha|beta|rc))+)?</version>#', $mokoContent, $m)) {
                 $mokoVersion = $m[1];
+                $existingSuffix = $m[2] ?? '';
             }
         }
         $readmeVersion = null;
@@ -117,7 +119,8 @@ class VersionBumpCli extends CliFramework
                 }
                 break;
         }
-        $newFull = sprintf('%02d.%02d.%02d', $major, $minor, $patch);
+        $newBase = sprintf('%02d.%02d.%02d', $major, $minor, $patch);
+        $newFull = $newBase . $existingSuffix;
         if (file_exists($mokoManifest) && !empty($mokoContent)) {
             $pattern = '#<version>\d{2}\.\d{2}\.\d{2}'
                 . '(?:(?:-(?:dev|alpha|beta|rc))+)?</version>#';
@@ -132,7 +135,7 @@ 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}' . $newFull, $readmeContent, 1);
+            $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);
             }
@@ -193,7 +196,7 @@ class VersionBumpCli extends CliFramework
         $changelogFile = "{$root}/CHANGELOG.md";
         if (file_exists($changelogFile)) {
             $clContent = file_get_contents($changelogFile);
-            $updatedCl = preg_replace('/(VERSION:\s*)\d{2}\.\d{2}\.\d{2}(?:(?:-(?:dev|alpha|beta|rc))+)?/m', '${1}' . $newFull, $clContent);
+            $updatedCl = preg_replace('/(VERSION:\s*)\d{2}\.\d{2}\.\d{2}(?:(?:-(?:dev|alpha|beta|rc))+)?/m', '${1}' . $newBase, $clContent);
             if ($updatedCl !== null && $updatedCl !== $clContent) {
                 file_put_contents($changelogFile, $updatedCl);
                 fwrite(STDERR, "Updated CHANGELOG.md\n");
@@ -201,7 +204,7 @@ 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}(?:(?:-(?:dev|alpha|beta|rc))+)?/m';
+        $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)) {
@@ -236,7 +239,7 @@ class VersionBumpCli extends CliFramework
             if (preg_match('/^#\s*REPO:\s*https?:\/\//m', $content)) {
                 continue;
             }
-            $updated = preg_replace($versionPattern, '${1}' . $newFull, $content);
+            $updated = preg_replace($versionPattern, '${1}' . $newBase, $content);
             if ($updated !== null && $updated !== $content) {
                 file_put_contents($filePath, $updated);
                 $genericUpdated[] = $relPath;