climaybe 3.1.4 → 3.3.0

package/README.md

@@ -94,7 +94,11 @@ Switch your local dev environment to a specific store (multi-store only).
 npx climaybe switch voldt-norway
 ```
 
-Copies `stores/<alias>/` JSON files to the repo root so you can preview that store locally, and sets `default_store` in `climaybe.config.json` so `climaybe serve` / `shopify theme dev` targets that store. If your current git branch is `staging-<alias>` or `live-<alias>`, `climaybe serve` uses that store’s domain from config (even if `default_store` differs), matching CI preview behavior.
+Copies `stores/<alias>/` JSON files to the repo root so you can preview that store locally, and sets `default_store` in `climaybe.config.json` so `climaybe serve` / `shopify theme dev` targets that store. If your current git branch is `staging-<alias>` or `live-<alias>`, `climaybe serve` still passes that branch’s store to Shopify for `--store` (even if `default_store` differs), matching CI preview behavior.
+
+### `climaybe serve` / `climaybe theme serve`
+
+Runs Tailwind/scripts/schema watchers and `shopify theme dev` (see the theme dev kit section for flags). In **multi-store** mode, the first step asks **which store to serve** (interactive terminal); the default choice is the store matching `default_store` (same as after `climaybe switch`). If you pick a **different** store, the CLI saves the current root `config/`, `templates/`, and `sections/` JSON files into `stores/<previous-alias>/` (same paths as `climaybe sync`), then copies the selected store’s JSONs to the root and updates `default_store`, so work in progress is not lost. In **CI** or when **stdin is not a TTY**, there is no prompt: it uses `default_store` unless you set **`CLIMAYBE_SERVE_STORE=<alias>`** to a configured alias.
 
 ### `climaybe sync [alias]` / `climaybe theme sync`
 
@@ -227,12 +231,14 @@ Enabled via `climaybe init` prompt (`Enable preview + cleanup workflows?`; defau
 
 | Workflow | Trigger | What it does |
 |----------|---------|-------------|
-| `pr-update.yml` | PR opened/synchronize/reopened (base: main, staging, develop, staging-*, live-*) | Shares draft theme, renames with `-PR<number>`, comments preview + customize URLs; uses default store for main/staging/develop, or the store for staging-&lt;alias&gt;/live-&lt;alias&gt;. **Path filter:** runs only when the PR changes theme paths (`assets/`, `blocks/`, `config/`, `layout/`, `locales/`, `sections/`, `snippets/`, `templates/`, `_scripts/`, `_styles/`, `shopify.theme.toml`, `stores/**`); docs-only or tooling-only PRs skip preview work. |
-| `pr-close.yml` | PR closed (same branch set) | Deletes matching preview themes and comments deleted count + names |
-| `reusable-share-theme.yml` | workflow_call | Shares Shopify draft theme and returns `theme_id` |
-| `reusable-rename-theme.yml` | workflow_call | Renames shared theme to include `PR<number>` (fails job on rename failure) |
-| `reusable-comment-on-pr.yml` | workflow_call | Posts preview comment including Customize URL |
-| `reusable-cleanup-themes.yml` | workflow_call | Deletes preview themes by PR number and exposes cleanup outputs |
+| `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 + base 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>` bases, 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). |
+| `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-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 |
 
 ### Optional build + Lighthouse package
@@ -374,7 +380,7 @@ Add the following secrets to your GitHub repository (or use **GitLab CI/CD varia
 
 **Store URL:** During `climaybe init` (or `add-store`), store URL secret(s) are set from your configured store domain(s); theme tokens are optional prompts.
 
-**Multi-store:** Per-store secrets `SHOPIFY_STORE_URL_<ALIAS>` and `SHOPIFY_THEME_ACCESS_TOKEN_<ALIAS>` — the URL is set from config; you must provide the theme token per store. `<ALIAS>` is uppercase with hyphens as underscores (e.g. `voldt-norway` → `SHOPIFY_STORE_URL_VOLDT_NORWAY`). Preview and cleanup: for PRs targeting **main**, **staging**, or **develop** the workflows use the **default store** (from `config.default_store` or first in `config.stores`); for PRs targeting **staging-&lt;alias&gt;** or **live-&lt;alias&gt;** they use that store’s credentials. Set either the plain `SHOPIFY_*` secrets or the `_<ALIAS>` pair for each store you use in preview.
+**Multi-store:** Per-store secrets `SHOPIFY_STORE_URL_<ALIAS>` and `SHOPIFY_THEME_ACCESS_TOKEN_<ALIAS>` — the URL is set from config; you must provide the theme token per store. `<ALIAS>` is uppercase with hyphens as underscores (e.g. `voldt-norway` → `SHOPIFY_STORE_URL_VOLDT_NORWAY`). **Preview:** for PRs targeting **staging-&lt;alias&gt;** or **live-&lt;alias&gt;** only that store is used. For **main**, **staging**, **develop**, or other bases with **multiple** stores in `climaybe.config.json`, **pr-update** publishes the preview theme to **every** store (each must have secrets); **pr-close** cleans that PR’s preview themes on **all** stores. For a **single** store in config, behavior matches the default-store case. Optional **cleanup-orphan-preview-themes** (weekly + manual) removes stale `-PR<n>` themes when PR `n` is no longer open.
 
 ## Directory Structure (Multi-store)
 

package/bin/version.txt

@@ -1 +1 @@
-3.1.4
+3.3.0

package/package.json

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

package/src/index.js

@@ -64,8 +64,12 @@ function registerThemeCommands(cmd) {
     .command('serve')
     .description('Run local theme dev (Shopify + assets; Theme Check off by default)')
     .option('--theme-check', 'Enable Theme Check watcher')
-    .action((opts) => serveAll({ includeThemeCheck: opts.themeCheck === true }));
-  cmd.command('serve:shopify').description('Run Shopify theme dev server').action(() => serveShopify());
+    .action(async (opts) => {
+      await serveAll({ includeThemeCheck: opts.themeCheck === true });
+    });
+  cmd.command('serve:shopify').description('Run Shopify theme dev server').action(async () => {
+    await serveShopify();
+  });
   cmd
     .command('serve:assets')
     .description('Run assets watch (Tailwind + scripts; Theme Check off by default)')

package/src/lib/config.js

@@ -180,6 +180,23 @@ export function getStoreAliases(cwd = process.cwd()) {
   return Object.keys(config.stores);
 }
 
+/**
+ * Resolve the store alias for `default_store` (the domain last set by `climaybe switch` or serve).
+ * @param {string} [cwd]
+ * @returns {string | null}
+ */
+export function getAliasForDefaultStore(cwd = process.cwd()) {
+  const config = readConfig(cwd);
+  const domain = config?.default_store;
+  const stores = config?.stores;
+  if (!domain || !stores || typeof stores !== 'object') return null;
+  const normalized = String(domain).trim();
+  for (const [alias, storeDomain] of Object.entries(stores)) {
+    if (String(storeDomain).trim() === normalized) return alias;
+  }
+  return null;
+}
+
 /**
  * Determine the current mode: 'single' or 'multi'.
  */

package/src/lib/dev-runtime.js

@@ -4,6 +4,7 @@ import { watchTree } from './watch.js';
 import { isAbsolute, join, relative } from 'node:path';
 import pc from 'picocolors';
 import { readConfig, getStoreDomainFromBranch } from './config.js';
+import { prepareMultiStoreForServe } from './serve-multi-store.js';
 import { buildScripts } from './build-scripts.js';
 import { buildSchemas } from './schema-builder.js';
 import { runShopify } from './shopify-cli.js';
@@ -209,7 +210,15 @@ function runThemeCheckFiltered({ cwd = process.cwd() } = {}) {
   return child;
 }
 
-export function serveShopify({ cwd = process.cwd() } = {}) {
+/**
+ * @param {{ cwd?: string; skipMultiStorePrep?: boolean }} [opts]
+ * @returns {Promise<import('node:child_process').ChildProcess | null>} Null when multi-store prep failed or was cancelled.
+ */
+export async function serveShopify({ cwd = process.cwd(), skipMultiStorePrep = false } = {}) {
+  if (!skipMultiStorePrep) {
+    const ok = await prepareMultiStoreForServe(cwd);
+    if (!ok) return null;
+  }
   const config = readConfig(cwd) || {};
   const branchStore = getStoreDomainFromBranch(cwd);
   const store = branchStore || config.default_store || config.store || '';
@@ -232,8 +241,14 @@ export function serveAssets({ cwd = process.cwd(), includeThemeCheck = false } =
     writeTaggedLine('tailwind', pc.blue, 'watching _styles/main.css -> assets/style.css');
   }
 
-  // Optional dev MCP (non-blocking if missing)
-  const devMcp = spawnLogged('npx', ['-y', '@shopify/dev-mcp@latest'], { name: 'dev-mcp', cwd });
+  // Optional dev MCP (non-blocking if missing). @shopify/dev-mcp pulls hydrogen (peers react-router 7.12)
+  // alongside react-router 7.13 — npm warns with ERESOLVE unless legacy peer resolution is enabled.
+  const devMcpEnv = { ...process.env, npm_config_legacy_peer_deps: 'true' };
+  const devMcp = spawnLogged('npx', ['-y', '@shopify/dev-mcp@latest'], {
+    name: 'dev-mcp',
+    cwd,
+    env: devMcpEnv,
+  });
 
   const scriptsDir = join(cwd, '_scripts');
   if (existsSync(scriptsDir)) {
@@ -359,16 +374,28 @@ export function serveAssets({ cwd = process.cwd(), includeThemeCheck = false } =
   return { tailwind, devMcp, scriptsWatch, schemasWatch, themeCheckWatch, cleanup };
 }
 
-export function serveAll({ cwd = process.cwd(), includeThemeCheck = false } = {}) {
+export async function serveAll({ cwd = process.cwd(), includeThemeCheck = false } = {}) {
+  const prepOk = await prepareMultiStoreForServe(cwd);
+  if (!prepOk) {
+    const noop = () => {};
+    return { cleanup: noop };
+  }
+
   // Start assets first, then bring up Shopify after a short delay.
   const assets = serveAssets({ cwd, includeThemeCheck });
   let shopify = null;
   const shopifyStartDelayMs = 2500;
   const shopifyTimer = setTimeout(() => {
-    shopify = serveShopify({ cwd });
-    shopify.on('exit', () => {
-      cleanup();
-    });
+    void (async () => {
+      shopify = await serveShopify({ cwd, skipMultiStorePrep: true });
+      if (shopify) {
+        shopify.on('exit', () => {
+          cleanup();
+        });
+      } else {
+        cleanup();
+      }
+    })();
   }, shopifyStartDelayMs);
   console.log(pc.dim(`  Waiting ${shopifyStartDelayMs}ms before starting Shopify...`));
 

package/src/lib/prompts.js

@@ -229,6 +229,28 @@ export async function promptProjectName(cwd = process.cwd()) {
   return String(projectName || '').trim();
 }
 
+/**
+ * Ask which store to use for local theme dev (multi-store `climaybe serve`).
+ * @param {{ aliases: string[]; stores: Record<string, string>; suggestedAlias: string }} opts
+ * @returns {Promise<string | null>} Selected alias, or null if cancelled.
+ */
+export async function promptServeStore({ aliases, stores, suggestedAlias }) {
+  const sorted = [...aliases].sort();
+  const choices = sorted.map((alias) => ({
+    title: `${alias} (${stores[alias]})`,
+    value: alias,
+  }));
+  const initialIndex = sorted.indexOf(suggestedAlias);
+  const { alias } = await prompts({
+    type: 'select',
+    name: 'alias',
+    message: 'Which store should we serve?',
+    choices,
+    initial: initialIndex >= 0 ? initialIndex : 0,
+  });
+  return alias ?? null;
+}
+
 /**
  * Prompt for a single new store (used by add-store command).
  * Takes existing aliases to prevent duplicates.

package/src/lib/serve-multi-store.js

@@ -0,0 +1,81 @@
+import pc from 'picocolors';
+import { readConfig, getMode, getProjectType, getStoreAliases, writeConfig, getAliasForDefaultStore } from './config.js';
+import { rootToStores, storesToRoot } from './store-sync.js';
+import { promptServeStore } from './prompts.js';
+
+function readExplicitServeAlias(cwd) {
+  const raw = process.env.CLIMAYBE_SERVE_STORE?.trim();
+  if (!raw) return { ok: true, alias: null };
+  const aliases = getStoreAliases(cwd);
+  if (aliases.includes(raw)) return { ok: true, alias: raw };
+  console.log(pc.red(`  CLIMAYBE_SERVE_STORE="${raw}" is not a known store alias.`));
+  console.log(pc.dim(`  Available: ${aliases.join(', ')}\n`));
+  return { ok: false, alias: null };
+}
+
+function isNonInteractiveServe() {
+  if (process.env.CLIMAYBE_SERVE_STORE?.trim()) return true;
+  if (process.env.CI === 'true') return true;
+  return process.stdin.isTTY !== true;
+}
+
+/**
+ * In multi-store theme repos, ensure root JSONs and `default_store` match the store
+ * the user wants to serve. If the choice differs from the previous switch target,
+ * saves current root → `stores/<previous>/` then loads `stores/<selected>/` → root.
+ *
+ * @param {string} [cwd]
+ * @returns {Promise<boolean>} False if the user cancelled or `CLIMAYBE_SERVE_STORE` is invalid.
+ */
+export async function prepareMultiStoreForServe(cwd = process.cwd()) {
+  if (getProjectType(cwd) === 'app') return true;
+  if (getMode(cwd) !== 'multi') return true;
+
+  const config = readConfig(cwd);
+  if (!config?.stores || typeof config.stores !== 'object') return true;
+
+  const aliases = getStoreAliases(cwd);
+  if (aliases.length < 2) return true;
+
+  const stores = config.stores;
+  const suggestedAlias = getAliasForDefaultStore(cwd) ?? aliases[0];
+
+  const explicit = readExplicitServeAlias(cwd);
+  if (!explicit.ok) return false;
+
+  let selected = explicit.alias;
+  if (!selected) {
+    if (isNonInteractiveServe()) {
+      selected = suggestedAlias;
+    } else {
+      console.log(pc.bold('\n  climaybe — serve (store)\n'));
+      selected = await promptServeStore({ aliases, stores, suggestedAlias });
+      if (!selected) {
+        console.log(pc.dim('  Cancelled.\n'));
+        return false;
+      }
+    }
+  }
+
+  const previousAlias = getAliasForDefaultStore(cwd);
+
+  if (selected === previousAlias) return true;
+
+  if (previousAlias) {
+    rootToStores(previousAlias, cwd);
+  } else {
+    console.log(
+      pc.yellow(
+        '  Warning: default_store did not match any store alias; current root JSONs are not auto-saved to a store folder.'
+      )
+    );
+  }
+
+  const ok = storesToRoot(selected, cwd);
+  if (!ok) return false;
+
+  const domain = stores[selected];
+  if (domain) writeConfig({ default_store: domain }, cwd);
+
+  return true;
+}

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

@@ -0,0 +1,59 @@
+# climaybe — Cleanup orphan preview themes (optional)
+# Weekly (and manual): on each configured store, delete themes whose name ends with -PR<n>
+# when PR #n is not open in this repo (merged/closed without theme cleanup).
+
+name: Cleanup orphan preview themes
+
+on:
+  schedule:
+    - cron: '0 6 * * 1'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pull-requests: read
+
+jobs:
+  configure:
+    runs-on: ubuntu-latest
+    outputs:
+      preview_targets_json: ${{ steps.cfg.outputs.preview_targets_json }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build store matrix from climaybe.config.json
+        id: cfg
+        run: |
+          if [ ! -f climaybe.config.json ]; then
+            {
+              echo 'preview_targets_json<<PT_JSON'
+              echo '[]'
+              echo 'PT_JSON'
+            } >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          node <<'NODE' >>"$GITHUB_OUTPUT"
+          const fs = require('fs');
+          const cfg = JSON.parse(fs.readFileSync('climaybe.config.json', 'utf8'));
+          const stores = cfg?.stores || {};
+          const keys = Object.keys(stores);
+          const aliasToSecret = (a) => String(a).toUpperCase().replace(/-/g, '_');
+          const targets = keys.map((alias) => ({ alias, alias_secret: aliasToSecret(alias) }));
+          console.log('preview_targets_json<<PT_JSON');
+          console.log(JSON.stringify(targets));
+          console.log('PT_JSON');
+          NODE
+
+  cleanup-orphans:
+    needs: [configure]
+    if: needs.configure.outputs.preview_targets_json != '[]'
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJson(needs.configure.outputs.preview_targets_json) }}
+    uses: ./.github/workflows/reusable-cleanup-themes.yml
+    with:
+      cleanup_mode: orphan_pr
+      pr_number: ''
+      store_alias_secret: ${{ matrix.alias_secret }}
+    secrets: inherit

package/src/workflows/preview/pr-close.yml

@@ -8,6 +8,10 @@ on:
     types: [closed]
     branches: [main, staging, develop, 'staging-*', 'live-*']
 
+permissions:
+  contents: read
+  pull-requests: write
+
 jobs:
   extract-pr-number:
     uses: ./.github/workflows/reusable-extract-pr-number.yml
@@ -15,72 +19,123 @@ jobs:
   resolve-store:
     runs-on: ubuntu-latest
     outputs:
-      store_alias_secret: ${{ steps.resolve.outputs.alias_secret }}
+      store_alias: ${{ steps.resolve.outputs.store_alias }}
+      store_alias_secret: ${{ steps.resolve.outputs.store_alias_secret }}
+      preview_targets_json: ${{ steps.resolve.outputs.preview_targets_json }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Resolve store alias from base branch
+      - name: Resolve preview store targets from base branch
         id: resolve
         env:
           BASE_REF: ${{ github.event.pull_request.base.ref }}
         run: |
-          if [[ -n "$BASE_REF" && ("$BASE_REF" == staging-* || "$BASE_REF" == live-*) ]]; then
-            ALIAS="${BASE_REF#staging-}"
-            ALIAS="${ALIAS#live-}"
-          else
-            ALIAS=$(node -e "
-              const fs = require('fs');
-              const cfg = JSON.parse(fs.readFileSync('./climaybe.config.json', 'utf8'));
-              const stores = cfg?.stores || {};
-              const defaultStoreRaw = cfg?.default_store;
-              const normalize = (v) => String(v || '')
-                .toLowerCase()
-                .replace(/^https?:\\/\\//, '')
-                .replace(/\\/.*$/, '');
-              const defaultStore = normalize(defaultStoreRaw);
-              let alias = '';
-              if (defaultStore) {
-                for (const [k, d] of Object.entries(stores)) {
-                  if (normalize(d) === defaultStore) {
-                    alias = k;
-                    break;
-                  }
+          node <<'NODE' >>"$GITHUB_OUTPUT"
+          const fs = require('fs');
+          const cfg = JSON.parse(fs.readFileSync('climaybe.config.json', 'utf8'));
+          const stores = cfg?.stores || {};
+          const keys = Object.keys(stores);
+          const baseRef = process.env.BASE_REF || '';
+          const isMulti = keys.length > 1;
+          const isStagingLive =
+            baseRef && (/^staging-/.test(baseRef) || /^live-/.test(baseRef));
+
+          const aliasToSecret = (a) => String(a).toUpperCase().replace(/-/g, '_');
+          const normalizeDomain = (v) =>
+            String(v || '')
+              .toLowerCase()
+              .replace(/^https?:\/\//, '')
+              .replace(/\/.*$/, '');
+
+          let targets = [];
+          if (isMulti && !isStagingLive) {
+            targets = keys.map((alias) => ({ alias, alias_secret: aliasToSecret(alias) }));
+          } else if (isStagingLive) {
+            let a = baseRef.replace(/^staging-/, '').replace(/^live-/, '');
+            targets = [{ alias: a, alias_secret: aliasToSecret(a) }];
+          } else {
+            const defaultStoreNorm = normalizeDomain(cfg?.default_store);
+            let alias = '';
+            if (defaultStoreNorm) {
+              for (const [k, d] of Object.entries(stores)) {
+                if (normalizeDomain(d) === defaultStoreNorm) {
+                  alias = k;
+                  break;
                 }
               }
-              if (!alias) {
-                alias = Object.keys(stores)[0] || '';
-              }
-              if (!alias && defaultStore) {
-                const subdomain = defaultStore.split('.')[0] || 'default';
-                alias = subdomain.replace(/[^a-z0-9-]/g, '-').replace(/-+/g, '-') || 'default';
-              }
-              if (!alias) {
-                alias = 'default';
-              }
-              process.stdout.write(alias);
-            ")
-          fi
+            }
+            if (!alias) alias = keys[0] || '';
+            if (!alias && cfg?.default_store) {
+              const sub = normalizeDomain(cfg.default_store).split('.')[0] || 'default';
+              alias = sub.replace(/[^a-z0-9-]/g, '-').replace(/-+/g, '-') || 'default';
+            }
+            if (!alias) alias = 'default';
+            targets = [{ alias, alias_secret: aliasToSecret(alias) }];
+          }
 
-          if [ -z "$ALIAS" ]; then
-            echo "Could not resolve store alias from climaybe.config.json config or base branch."
-            exit 1
-          fi
+          if (targets.length === 0 || targets.some((t) => !t.alias)) {
+            console.error('Could not resolve store targets from climaybe.config.json');
+            process.exit(1);
+          }
 
-          ALIAS_SECRET=$(echo "$ALIAS" | tr '[:lower:]-' '[:upper:]_')
-          echo "alias=$ALIAS" >> $GITHUB_OUTPUT
-          echo "alias_secret=$ALIAS_SECRET" >> $GITHUB_OUTPUT
+          console.log('preview_targets_json<<PT_JSON');
+          console.log(JSON.stringify(targets));
+          console.log('PT_JSON');
+          console.log(`store_alias=${targets[0].alias}`);
+          console.log(`store_alias_secret=${targets[0].alias_secret}`);
+          NODE
 
   cleanup-theme:
     needs: [extract-pr-number, resolve-store]
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJson(needs.resolve-store.outputs.preview_targets_json) }}
     uses: ./.github/workflows/reusable-cleanup-themes.yml
     with:
+      cleanup_mode: by_pr
       pr_number: ${{ needs.extract-pr-number.outputs.pr_number }}
-      store_alias_secret: ${{ needs.resolve-store.outputs.store_alias_secret }}
+      store_alias_secret: ${{ matrix.alias_secret }}
+      result_artifact_prefix: pr-close-cleanup
     secrets: inherit
 
+  cleanup-totals:
+    needs: [cleanup-theme]
+    if: always()
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+    outputs:
+      deleted_count: ${{ steps.sum.outputs.deleted_count }}
+    steps:
+      - name: Download cleanup result fragments
+        continue-on-error: true
+        uses: actions/download-artifact@v4
+        with:
+          pattern: pr-close-cleanup-*
+          merge-multiple: true
+          path: cleanup-counts
+
+      - name: Sum deleted themes across stores
+        id: sum
+        run: |
+          total=0
+          if [ -d cleanup-counts ]; then
+            while IFS= read -r -d '' f; do
+              [ -z "$f" ] && continue
+              [ ! -f "$f" ] && continue
+              n="$(tr -d ' \n\r' < "$f" 2>/dev/null || echo 0)"
+              n="${n:-0}"
+              total=$((total + n))
+            done < <(find cleanup-counts -name 'deleted-count.txt' -type f -print0 2>/dev/null || true)
+          fi
+          echo "deleted_count=$total" >> "$GITHUB_OUTPUT"
+          echo "Total deleted across stores: $total"
+
   comment-on-pr:
-    needs: cleanup-theme
+    needs: [cleanup-totals, resolve-store]
+    if: always()
     runs-on: ubuntu-latest
     steps:
       - name: Comment on PR about cleanup
@@ -88,8 +143,8 @@ jobs:
         with:
           script: |
             const prNumber = context.payload.pull_request.number;
-            const deletedCount = parseInt('${{ needs.cleanup-theme.outputs.deleted_count }}') || 0;
-            const deletedThemesRaw = `${{ needs.cleanup-theme.outputs.deleted_themes }}`.trim();
+            const storeAlias = '${{ needs.resolve-store.outputs.store_alias }}' || '';
+            const deletedCount = parseInt('${{ needs.cleanup-totals.outputs.deleted_count }}') || 0;
 
             const lines = [
               '## 🧹 Theme Cleanup Complete',
@@ -98,20 +153,9 @@ jobs:
               '',
               `**Branch:** ${context.payload.pull_request.head.ref}`,
               `**PR Status:** ${context.payload.pull_request.state}`,
-              `**Deleted Themes:** ${deletedCount}`
-            ];
-
-            if (deletedCount > 0 && deletedThemesRaw) {
-              const deletedThemeLines = deletedThemesRaw
-                .split('\n')
-                .map(name => name.trim())
-                .filter(Boolean)
-                .map(name => `- ${name}`);
-
-              if (deletedThemeLines.length > 0) {
-                lines.push('', '### Deleted Theme Names', ...deletedThemeLines);
-              }
-            }
+              storeAlias ? `**Primary store (config):** ${storeAlias}` : null,
+              `**Deleted themes (all preview stores):** ${deletedCount}`
+            ].filter(Boolean);
 
             lines.push('', '---', '*Theme cleanup runs automatically when a PR is closed.*');