feat: unlock MokoCassiopeia + lock MokoOnyx during bridge migration

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

.github/workflows/release.yml

@@ -104,15 +104,7 @@ jobs:
           INPUT_SUFFIX: ${{ steps.meta.outputs.suffix }}
         run: |
           BRANCH="${{ github.ref_name }}"
-
-          # Skip auto-bump on main — version is already set before merge
-          if [ "$BRANCH" = "main" ]; then
-            CURRENT=$(sed -n 's/.*VERSION:[[:space:]]*\([0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\).*/\1/p' README.md 2>/dev/null | head -1)
-            echo "On main — using current version ${CURRENT} (no bump)"
-            echo "version=${CURRENT}" >> "$GITHUB_OUTPUT"
-            echo "zip_name=${EXT_ELEMENT}-${CURRENT}${INPUT_SUFFIX}.zip" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
+          GITEA_API="${GITEA_URL}/api/v1/repos/${{ github.repository }}"
 
           # Read current version from README.md
           CURRENT=$(sed -n 's/.*VERSION:[[:space:]]*\([0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\).*/\1/p' README.md 2>/dev/null | head -1)
@@ -163,7 +155,7 @@ jobs:
           PYEOF
           fi
 
-          # Commit bump
+          # Commit bump to current branch
           git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
           git config --local user.name "gitea-actions[bot]"
           git remote set-url origin "https://jmiller:${GA_TOKEN}@git.mokoconsulting.tech/${{ github.repository }}.git"
@@ -174,6 +166,21 @@ jobs:
             git push
           }
 
+          # For stable releases from dev: merge dev → main via Gitea API
+          if [ "$INPUT_STABILITY" = "stable" ] && [ "$BRANCH" != "main" ]; then
+            echo "Merging ${BRANCH} → main via Gitea API..."
+            MERGE_RESULT=$(curl -sf -X POST -H "Authorization: token ${GA_TOKEN}" \
+              -H "Content-Type: application/json" \
+              "${GITEA_API}/merges" \
+              -d "$(jq -n \
+                --arg base "main" \
+                --arg head "${BRANCH}" \
+                --arg msg "chore(release): merge ${BRANCH} for stable ${NEW_VERSION} [skip ci]" \
+                '{base: $base, head: $head, merge_message_field: $msg}'
+              )" 2>&1) || true
+            echo "Merge result: ${MERGE_RESULT}"
+          fi
+
           echo "version=${NEW_VERSION}" >> "$GITHUB_OUTPUT"
           echo "zip_name=${EXT_ELEMENT}-${NEW_VERSION}${INPUT_SUFFIX}.zip" >> "$GITHUB_OUTPUT"
 
@@ -368,6 +375,7 @@ jobs:
             exit 0
           fi
 
+          # Cascading channels: each stability updates itself and all lower levels
           export PY_STABILITY="$STABILITY" PY_VERSION="$VERSION" PY_SHA256="$SHA256" \
                  PY_ZIP_NAME="$ZIP_NAME" PY_TAG="$TAG" PY_DATE="$DATE" \
                  PY_GITEA_ORG="$GITEA_ORG" PY_GITEA_REPO="$GITEA_REPO"
@@ -383,73 +391,53 @@ jobs:
           gitea_org  = os.environ["PY_GITEA_ORG"]
           gitea_repo = os.environ["PY_GITEA_REPO"]
 
-          # Map stability to the <tag> value in updates.xml
-          tag_map = {
-              "development": "development",
-              "alpha": "alpha",
-              "beta": "beta",
-              "rc": "rc",
-              "stable": "stable",
+          # Cascade map: each level updates itself + all lower levels
+          cascade = {
+              "stable": ["development", "alpha", "beta", "rc", "stable"],
+              "rc": ["development", "alpha", "beta", "rc"],
+              "beta": ["development", "alpha", "beta"],
+              "alpha": ["development", "alpha"],
+              "development": ["development"],
           }
-          xml_tag = tag_map.get(stability, "development")
+          targets = cascade.get(stability, [stability])
 
           with open("updates.xml", "r") as f:
               content = f.read()
 
-          # Build regex to find the specific <update> block for this stability tag
-          # Use negative lookahead to avoid matching across multiple <update> blocks
+          gitea_url = f"https://git.mokoconsulting.tech/{gitea_org}/{gitea_repo}/releases/download/{tag}/{zip_name}"
+
+          for xml_tag in targets:
               block_pattern = r"(<update>(?:(?!</update>).)*?<tag>" + re.escape(xml_tag) + r"</tag>.*?</update>)"
               match = re.search(block_pattern, content, re.DOTALL)
 
               if not match:
-              print(f"No <update> block found for <tag>{xml_tag}</tag>")
-              exit(0)
+                  print(f"No block for <tag>{xml_tag}</tag> — skipping")
+                  continue
 
               block = match.group(1)
-          original_block = block
+              original = block
 
-          # Update version
               block = re.sub(r"<version>[^<]*</version>", f"<version>{version}</version>", block)
-
-          # Update creation date
               block = re.sub(r"<creationDate>[^<]*</creationDate>", f"<creationDate>{date}</creationDate>", block)
 
-          # Update or add SHA-256
               if "<sha256>" in block:
                   block = re.sub(r"<sha256>[^<]*</sha256>", f"<sha256>{sha256}</sha256>", block)
               else:
                   block = block.replace("</downloads>", f"</downloads>\n    <sha256>{sha256}</sha256>")
 
-          # Update Gitea download URL
-          gitea_url = f"https://git.mokoconsulting.tech/{gitea_org}/{gitea_repo}/releases/download/{tag}/{zip_name}"
               block = re.sub(
                   r"(<downloadurl[^>]*>)https://git\.mokoconsulting\.tech/[^<]*(</downloadurl>)",
                   rf"\g<1>{gitea_url}\g<2>",
                   block
               )
 
-          # Update GitHub download URL only for RC and stable (others are Gitea-only)
-          if stability in ("rc", "stable"):
-              gh_url = f"https://github.com/mokoconsulting-tech/{gitea_repo}/releases/download/{tag}/{zip_name}"
-              block = re.sub(
-                  r"(<downloadurl[^>]*>)https://github\.com/[^<]*(</downloadurl>)",
-                  rf"\g<1>{gh_url}\g<2>",
-                  block
-              )
-          else:
-              # Remove any GitHub download URL for dev/alpha/beta
-              block = re.sub(
-                  r"\n\s*<downloadurl[^>]*>https://github\.com/[^<]*</downloadurl>",
-                  "",
-                  block
-              )
-
-          content = content.replace(original_block, block)
+              content = content.replace(original, block)
+              print(f"Updated {xml_tag} channel")
 
           with open("updates.xml", "w") as f:
               f.write(content)
 
-          print(f"Updated {xml_tag} channel: version={version}, sha={sha256[:16]}..., date={date}")
+          print(f"Cascaded {stability} → {', '.join(targets)}: v={version}, sha={sha256[:16]}...")
           PYEOF
 
       - name: "Commit updates.xml to current branch and main"

README.md

@@ -9,7 +9,7 @@
  INGROUP: MokoCassiopeia.Documentation
  REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia
  FILE: ./README.md
- VERSION: 03.10.22
+ VERSION: 03.10.23
  BRIEF: Documentation for MokoCassiopeia template
  -->
 

composer.json

@@ -10,9 +10,8 @@
         }
     ],
     "require": {
-        "ext-zip": "*",
-        "mokoconsulting-tech/enterprise": "dev-version/04",
-        "php": ">=8.1"
+        "php": ">=8.1",
+        "ext-zip": "*"
     },
     "require-dev": {
         "mokoconsulting-tech/enterprise": "^4.0"

src/script.php

@@ -122,11 +122,14 @@ class Tpl_MokocassiopeiaInstallerScript implements InstallerScriptInterface
         // 5. Redirect update server to MokoOnyx
         $this->updateUpdateServer();
 
-        // 6. Notify
+        // 6. Unlock MokoCassiopeia (allow uninstall) + lock MokoOnyx (prevent accidental uninstall)
+        $this->updateExtensionLocks();
+
+        // 7. Notify
         $app->enqueueMessage(
             '<strong>MokoOnyx has been installed as a replacement for MokoCassiopeia.</strong><br>'
             . 'Your template settings have been migrated. MokoOnyx is now your active site template.<br>'
-            . 'You can safely uninstall MokoCassiopeia from Extensions &rarr; Manage.',
+            . 'MokoCassiopeia has been unlocked — you can uninstall it from Extensions &rarr; Manage.',
             'success'
         );
 
@@ -362,6 +365,42 @@ class Tpl_MokocassiopeiaInstallerScript implements InstallerScriptInterface
         }
     }
 
+    private function updateExtensionLocks(): void
+    {
+        $db = Factory::getDbo();
+
+        // Unlock MokoCassiopeia — allow uninstall
+        try {
+            $query = $db->getQuery(true)
+                ->update('#__extensions')
+                ->set($db->quoteName('locked') . ' = 0')
+                ->set($db->quoteName('protected') . ' = 0')
+                ->where($db->quoteName('element') . ' = ' . $db->quote(self::OLD_NAME))
+                ->where($db->quoteName('type') . ' = ' . $db->quote('template'));
+            $db->setQuery($query)->execute();
+            if ($db->getAffectedRows() > 0) {
+                $this->log('Bridge: unlocked MokoCassiopeia (can be uninstalled).');
+            }
+        } catch (\Throwable $e) {
+            $this->log('Bridge: failed to unlock MokoCassiopeia: ' . $e->getMessage(), 'warning');
+        }
+
+        // Lock MokoOnyx — prevent accidental uninstall
+        try {
+            $query = $db->getQuery(true)
+                ->update('#__extensions')
+                ->set($db->quoteName('locked') . ' = 1')
+                ->where($db->quoteName('element') . ' = ' . $db->quote(self::NEW_NAME))
+                ->where($db->quoteName('type') . ' = ' . $db->quote('template'));
+            $db->setQuery($query)->execute();
+            if ($db->getAffectedRows() > 0) {
+                $this->log('Bridge: locked MokoOnyx (protected from uninstall).');
+            }
+        } catch (\Throwable $e) {
+            $this->log('Bridge: failed to lock MokoOnyx: ' . $e->getMessage(), 'warning');
+        }
+    }
+
     // ── Logging ────────────────────────────────────────────────────────
 
     private function log(string $message, string $priority = 'info'): void

src/templateDetails.xml

@@ -39,7 +39,7 @@
 		</server>
 	</updateservers>
 	<name>MokoCassiopeia</name>
-	<version>03.10.22</version>
+	<version>03.10.23</version>
 	<scriptfile>script.php</scriptfile>
 	<creationDate>2026-04-19</creationDate>
 	<author>Jonathan Miller || Moko Consulting</author>