climaybe 3.4.3 → 3.4.5

package/README.md

@@ -233,11 +233,11 @@ Enabled via `climaybe init` prompt (`Enable preview + cleanup workflows?`; defau
 |----------|---------|-------------|
 | `pr-update.yml` | PR opened/synchronize/reopened (base: main, staging, develop, staging-*, live-*) | Shares draft theme, renames with `-PR<number>`, comments preview + customize URLs. **Multi-store + source branch (`pull_request.head.ref`) not** `staging-<alias>` **or** `live-<alias>`**:** publishes to **every** configured store (matrix) and posts **all** links in one PR comment. For `staging-<alias>` / `live-<alias>` source branches, only that store is used. **Path filter:** theme paths only (`assets/`, `blocks/`, `config/`, `layout/`, `locales/`, `sections/`, `snippets/`, `templates/`, `_scripts/`, `_styles/`, `shopify.theme.toml`, `stores/**`). |
 | `pr-close.yml` | PR closed (same branch set) | Deletes this PR’s preview themes using the **same store matrix rule** as `pr-update`; PR comment shows **total** deleted count across stores. |
-| `cleanup-orphan-preview-themes.yml` | Weekly (Mon 06:00 UTC) + `workflow_dispatch` | Per store: deletes themes ending with `-PR<n>` when PR `#n` is **not** open (merged/closed without cleanup). Uses `gh pr list` (limit 1000 open PRs). |
+| `cleanup-orphan-preview-themes.yml` | PR closed (same branch set) + weekly (Mon 06:00 UTC) + `workflow_dispatch` | Per store: deletes themes ending with `-PR<n>` when PR `#n` is **not** open (merged/closed without cleanup). Uses `gh pr list` (limit 1000 open PRs). |
 | `reusable-publish-pr-preview-store.yml` | workflow_call | Share + rename + upload comment fragment for **one** store (matrix leg in `pr-update`). |
 | `reusable-share-theme.yml` | workflow_call | Shares Shopify draft theme and returns `theme_id` (still available if you call it elsewhere) |
 | `reusable-rename-theme.yml` | workflow_call | Renames shared theme to include `PR<number>` (still available for custom flows) |
-| `reusable-comment-on-pr.yml` | workflow_call | Posts preview comment; aggregates `preview-fragment-*` artifacts when `use_preview_fragments` is true |
+| `reusable-comment-on-pr.yml` | workflow_call | Upserts one bot preview comment; aggregates `preview-fragment-*` artifacts when `use_preview_fragments` is true and removes older bot preview comments |
 | `reusable-cleanup-themes.yml` | workflow_call | `cleanup_mode: by_pr` deletes names ending with `-PR{padded}`; `orphan_pr` deletes `-PR<n>` when PR `n` is not open. Optional `result_artifact_prefix` for matrix fan-in on `pr-close` |
 | `reusable-extract-pr-number.yml` | workflow_call | Extracts padded/unpadded PR number outputs for naming and API-safe usage |
 

package/bin/version.txt

@@ -1 +1 @@
-3.4.3
+3.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "3.4.3",
+  "version": "3.4.5",
   "description": "Shopify CLI by Electric Maybe for theme CI/CD workflows, branch orchestration, app setup, and dev tooling",
   "type": "module",
   "bin": {

package/src/workflows/preview/cleanup-orphan-preview-themes.yml

@@ -5,6 +5,9 @@
 name: Cleanup orphan preview themes
 
 on:
+  pull_request:
+    types: [closed]
+    branches: [main, staging, develop, 'staging-*', 'live-*']
   schedule:
     - cron: '0 6 * * 1'
   workflow_dispatch:
@@ -12,6 +15,7 @@ on:
 permissions:
   contents: read
   pull-requests: read
+  actions: write
 
 jobs:
   configure:

package/src/workflows/preview/reusable-comment-on-pr.yml

@@ -56,6 +56,7 @@ jobs:
             const path = require('path');
             const issueNumber = parseInt(process.env.PR_NUMBER);
             const useFragments = process.env.USE_PREVIEW_FRAGMENTS === 'true';
+            const marker = '<!-- climaybe-preview-comment -->';
 
             const walkJsonFiles = (dir) => {
               const out = [];
@@ -84,6 +85,7 @@ jobs:
             }
 
             const parts = [
+              marker,
               '## 🎨 Theme Preview Generated',
               '',
               `**Branch:** ${context.payload.pull_request?.head?.ref || context.ref.replace('refs/heads/', '')}`,
@@ -92,7 +94,12 @@ jobs:
 
             if (fragments.length > 0) {
               parts.push('', '### Preview links (per store)');
-              const byAlias = [...fragments].sort((a, b) => String(a.alias).localeCompare(String(b.alias)));
+              const uniqueByAlias = new Map();
+              for (const f of fragments) {
+                const alias = String(f.alias || '').trim() || 'store';
+                uniqueByAlias.set(alias, f);
+              }
+              const byAlias = [...uniqueByAlias.values()].sort((a, b) => String(a.alias).localeCompare(String(b.alias)));
               for (const f of byAlias) {
                 const host = (f.store_host || '').replace(/\/$/, '');
                 const tid = f.theme_id || '';
@@ -129,10 +136,43 @@ jobs:
             }
 
             parts.push('', '---', '*This preview will be available for 7 days.*');
+            const body = parts.join('\n');
 
-            await github.rest.issues.createComment({
-              issue_number: issueNumber,
+            const comments = await github.paginate(github.rest.issues.listComments, {
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: parts.join('\n')
+              issue_number: issueNumber,
+              per_page: 100
             });
+            const managed = comments
+              .filter((c) => {
+                const text = String(c.body || '');
+                const botLike = c.user?.type === 'Bot' || String(c.user?.login || '').endsWith('[bot]');
+                const previewLike = text.includes(marker) || text.includes('## 🎨 Theme Preview Generated');
+                return botLike && previewLike;
+              })
+              .sort((a, b) => a.id - b.id);
+
+            if (managed.length > 0) {
+              const keep = managed[managed.length - 1];
+              await github.rest.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: keep.id,
+                body
+              });
+              for (const c of managed.slice(0, -1)) {
+                await github.rest.issues.deleteComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  comment_id: c.id
+                });
+              }
+            } else {
+              await github.rest.issues.createComment({
+                issue_number: issueNumber,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body
+              });
+            }

package/src/workflows/preview/reusable-publish-pr-preview-store.yml

@@ -143,20 +143,23 @@ jobs:
         run: |
           node <<'NODE'
           const fs = require('fs');
+          const alias = process.env.STORE_ALIAS || 'store';
+          const safeAlias = alias.toLowerCase().replace(/[^a-z0-9_-]/g, '-');
+          const fileName = `fragment-${safeAlias || 'store'}.json`;
           const url = (process.env.SHOPIFY_STORE_URL || '')
             .replace(/^https?:\/\//, '')
             .replace(/\/.*$/, '');
           const payload = {
-            alias: process.env.STORE_ALIAS || '',
+            alias,
             theme_id: process.env.THEME_ID || '',
             store_host: url,
           };
-          fs.writeFileSync('fragment.json', JSON.stringify(payload, null, 0));
+          fs.writeFileSync(fileName, JSON.stringify(payload, null, 0));
           NODE
 
       - name: Upload preview fragment
         uses: actions/upload-artifact@v4
         with:
           name: preview-fragment-${{ inputs.store_alias }}
-          path: fragment.json
+          path: fragment-*.json
           retention-days: 2