climaybe 1.4.3 → 1.5.1

package/README.md

@@ -4,15 +4,21 @@ Shopify CI/CD CLI — scaffolds GitHub Actions workflows, branch strategy, and s
 
 ## Install
 
+Install in your theme repo (project-only, no global install):
+
 ```bash
-npm install -g climaybe
+cd your-shopify-theme-repo
+npm install -D climaybe
 ```
 
+Run commands with `npx climaybe` (or add scripts to your `package.json`).
+
 ## Quick Start
 
 ```bash
 cd your-shopify-theme-repo
-climaybe init
+npm install -D climaybe
+npx climaybe init
 ```
 
 The interactive setup will ask for your store URL(s) and configure everything automatically.
@@ -38,7 +44,7 @@ Interactive setup that configures your repo for CI/CD.
 Add a new store to an existing setup.
 
 ```bash
-climaybe add-store
+npx climaybe add-store
 ```
 
 - Prompts for new store URL + alias
@@ -51,7 +57,7 @@ climaybe add-store
 Switch your local dev environment to a specific store (multi-store only).
 
 ```bash
-climaybe switch voldt-norway
+npx climaybe switch voldt-norway
 ```
 
 Copies `stores/<alias>/` JSON files to the repo root so you can preview that store locally.
@@ -61,17 +67,26 @@ Copies `stores/<alias>/` JSON files to the repo root so you can preview that sto
 Sync root JSON files back to a store directory (multi-store only).
 
 ```bash
-climaybe sync voldt-norway
+npx climaybe sync voldt-norway
 ```
 
 If no alias is given, syncs to the default store.
 
+### `climaybe ensure-branches`
+
+Create missing `staging` and per-store branches (`staging-<alias>`, `live-<alias>`) from your current branch (usually `main`). Use when the repo only has `main` (e.g. after a fresh clone) so the main → staging-&lt;store&gt; sync can run.
+
+```bash
+npx climaybe ensure-branches
+git push origin --all
+```
+
 ### `climaybe update-workflows`
 
 Refresh GitHub Actions workflows from the latest bundled templates.
 
 ```bash
-climaybe update-workflows
+npx climaybe update-workflows
 ```
 
 Useful after updating the CLI to get the latest workflow improvements.
@@ -217,7 +232,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); you are only prompted for the theme token.
 
-**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`).
+**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 workflows use the **default store** (from `config.default_store` or first store in `config.stores`), so set either the plain `SHOPIFY_*` secrets or the `_<ALIAS>` pair for that default store.
 
 ## Directory Structure (Multi-store)
 

package/bin/version.txt

@@ -1 +1 @@
-1.4.3
+1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "1.4.3",
+  "version": "1.5.1",
   "description": "Shopify CI/CD CLI — scaffolds workflows, branch strategy, and store config for single-store and multi-store theme repos",
   "type": "module",
   "bin": {

package/src/commands/ensure-branches.js

@@ -0,0 +1,52 @@
+import pc from 'picocolors';
+import { readConfig } from '../lib/config.js';
+import {
+  isGitRepo,
+  currentBranch,
+  ensureStagingBranch,
+  createStoreBranches,
+} from '../lib/git.js';
+
+/**
+ * Create missing staging and per-store branches from current HEAD.
+ * Use when the repo only has main (e.g. after clone) so the main → staging-<store> sync can run.
+ */
+export async function ensureBranchesCommand() {
+  console.log(pc.bold('\n  climaybe — Ensure Branches\n'));
+
+  const config = readConfig();
+  if (!config?.stores) {
+    console.log(pc.red('  No climaybe config found. Run "climaybe init" first.\n'));
+    return;
+  }
+
+  if (!isGitRepo()) {
+    console.log(pc.red('  Not a git repository. Run "git init" or clone the repo first.\n'));
+    return;
+  }
+
+  const branch = currentBranch();
+  const aliases = Object.keys(config.stores);
+  const mode = aliases.length > 1 ? 'multi' : 'single';
+
+  console.log(pc.dim(`  Current branch: ${branch}`));
+  console.log(pc.dim(`  Mode: ${mode}-store (${aliases.length} store(s))\n`));
+
+  ensureStagingBranch();
+
+  if (mode === 'multi') {
+    for (const alias of aliases) {
+      createStoreBranches(alias);
+    }
+  }
+
+  console.log(pc.bold(pc.green('\n  Branches ensured.\n')));
+  console.log(pc.dim('  Push them so CI can run:'));
+  console.log(pc.dim('    git push origin staging'));
+  if (mode === 'multi') {
+    for (const alias of aliases) {
+      console.log(pc.dim(`    git push origin staging-${alias} live-${alias}`));
+    }
+  }
+  console.log(pc.dim('  Or push all at once: git push origin --all\n'));
+}

package/src/index.js

@@ -4,6 +4,7 @@ import { addStoreCommand } from './commands/add-store.js';
 import { switchCommand } from './commands/switch.js';
 import { syncCommand } from './commands/sync.js';
 import { updateWorkflowsCommand } from './commands/update-workflows.js';
+import { ensureBranchesCommand } from './commands/ensure-branches.js';
 
 /**
  * Create the CLI program (for testing and for run).
@@ -51,6 +52,11 @@ export function createProgram(version = '0.0.0', packageDir = '') {
     .description('Refresh GitHub Actions workflows from latest bundled templates')
     .action(updateWorkflowsCommand);
 
+  program
+    .command('ensure-branches')
+    .description('Create missing staging and per-store branches from current HEAD (then push)')
+    .action(ensureBranchesCommand);
+
   return program;
 }
 

package/src/workflows/multi/stores-to-root.yml

@@ -24,6 +24,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 2
 
       - name: Skip if this is a sync commit
         id: gate
@@ -41,6 +42,29 @@ jobs:
             echo "skip=false" >> $GITHUB_OUTPUT
           fi
 
+      - name: Keep store-specific paths (e.g. locales) after main sync
+        if: steps.gate.outputs.skip != 'true'
+        run: |
+          # After a main→staging merge, restore store-specific paths from the pre-merge commit
+          # so they are not overwritten by main. Only run when paths exist (no pathspec error).
+          if [ ! -d "locales" ]; then
+            echo "No locales/ directory, skipping."
+            exit 0
+          fi
+          PARENT=$(git rev-parse HEAD^1 2>/dev/null || echo "")
+          if [ -z "$PARENT" ]; then
+            echo "Not a merge commit or shallow clone, skipping."
+            exit 0
+          fi
+          find locales -name "*.json" 2>/dev/null | while read -r f; do
+            git checkout "$PARENT" -- "$f" 2>/dev/null || true
+          done
+          if git diff --quiet; then
+            echo "No store-specific locale changes to restore."
+          else
+            echo "Restored store-specific locale files from pre-merge commit."
+          fi
+
       - name: Extract store alias from branch name
         if: steps.gate.outputs.skip != 'true'
         id: alias

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

@@ -12,12 +12,66 @@ jobs:
   extract-pr-number:
     uses: ./.github/workflows/reusable-extract-pr-number.yml
 
+  resolve-store:
+    runs-on: ubuntu-latest
+    outputs:
+      store_alias_secret: ${{ steps.resolve.outputs.alias_secret }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Resolve default store alias
+        id: resolve
+        run: |
+          ALIAS=$(node -e "
+            const fs = require('fs');
+            const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
+            const stores = pkg?.config?.stores || {};
+            const defaultStoreRaw = pkg?.config?.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;
+                }
+              }
+            }
+            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);
+          ")
+
+          if [ -z "$ALIAS" ]; then
+            echo "Could not resolve default store alias from package.json config."
+            exit 1
+          fi
+
+          ALIAS_SECRET=$(echo "$ALIAS" | tr '[:lower:]-' '[:upper:]_')
+          echo "alias=$ALIAS" >> $GITHUB_OUTPUT
+          echo "alias_secret=$ALIAS_SECRET" >> $GITHUB_OUTPUT
+
   cleanup-theme:
-    needs: extract-pr-number
+    needs: [extract-pr-number, resolve-store]
     uses: ./.github/workflows/reusable-cleanup-themes.yml
     with:
       pr_number: ${{ needs.extract-pr-number.outputs.pr_number }}
-    secrets: inherit
+    secrets:
+      SHOPIFY_STORE_URL: ${{ secrets[format('SHOPIFY_STORE_URL_{0}', needs.resolve-store.outputs.store_alias_secret)] || secrets.SHOPIFY_STORE_URL }}
+      SHOPIFY_THEME_ACCESS_TOKEN: ${{ secrets[format('SHOPIFY_THEME_ACCESS_TOKEN_{0}', needs.resolve-store.outputs.store_alias_secret)] || secrets.SHOPIFY_THEME_ACCESS_TOKEN }}
 
   comment-on-pr:
     needs: cleanup-theme

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

@@ -87,11 +87,13 @@ jobs:
           echo "Shopify credentials are configured for alias: ${{ steps.resolve.outputs.alias }}"
 
   cleanup-themes:
-    needs: extract-pr-number
+    needs: [extract-pr-number, validate-environment]
     uses: ./.github/workflows/reusable-cleanup-themes.yml
     with:
       pr_number: ${{ needs.extract-pr-number.outputs.pr_number }}
-    secrets: inherit
+    secrets:
+      SHOPIFY_STORE_URL: ${{ secrets[format('SHOPIFY_STORE_URL_{0}', needs.validate-environment.outputs.store_alias_secret)] || secrets.SHOPIFY_STORE_URL }}
+      SHOPIFY_THEME_ACCESS_TOKEN: ${{ secrets[format('SHOPIFY_THEME_ACCESS_TOKEN_{0}', needs.validate-environment.outputs.store_alias_secret)] || secrets.SHOPIFY_THEME_ACCESS_TOKEN }}
 
   share-theme:
     needs: [validate-environment, extract-pr-number, cleanup-themes]

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

@@ -33,8 +33,11 @@ jobs:
           PR_NUMBER: ${{ inputs.pr_number }}
         run: |
           if [ -z "$SHOPIFY_STORE_URL" ] || [ -z "$SHOPIFY_THEME_ACCESS_TOKEN" ]; then
-            echo "Missing Shopify secrets."
-            exit 1
+            echo "Missing Shopify secrets; skipping theme cleanup (no themes deleted)."
+            echo "deleted_count=0" >> $GITHUB_OUTPUT
+            echo "deleted_themes<<DELETED_EOF" >> $GITHUB_OUTPUT
+            echo "DELETED_EOF" >> $GITHUB_OUTPUT
+            exit 0
           fi
 
           THEME_LIST=$(shopify theme list \