climaybe 1.4.2 → 1.5.0

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.

package/bin/version.txt

@@ -1 +1 @@
-1.4.2
+1.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "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/commands/init.js

@@ -140,12 +140,12 @@ async function runInitFlow() {
   const existingNames =
     ciHost === 'github' ? listGitHubSecrets() : listGitLabVariables();
   const namesWeWillPrompt = new Set(secretsToPrompt.map((s) => s.name));
-  const alreadySet = existingNames.filter((n) => namesWeWillPrompt.has(n));
-  if (alreadySet.length > 0) {
-    const doUpdate = await promptUpdateExistingSecrets(alreadySet);
-    if (!doUpdate) {
-      console.log(pc.dim('\n  Skipping. Existing secrets left unchanged.\n'));
-      return;
+  const alreadySet = new Set(existingNames.filter((n) => namesWeWillPrompt.has(n)));
+  let doUpdateExisting = true;
+  if (alreadySet.size > 0) {
+    doUpdateExisting = await promptUpdateExistingSecrets([...alreadySet]);
+    if (!doUpdateExisting) {
+      console.log(pc.dim('\n  Skipping only the secret(s) already set; will still prompt for the rest.\n'));
     }
   }
 
@@ -159,6 +159,7 @@ async function runInitFlow() {
     stores,
   });
   for (const { name, value } of storeUrlSecrets) {
+    if (alreadySet.has(name) && !doUpdateExisting) continue;
     try {
       await setter.set(name, value);
       console.log(pc.green(`  Set ${name} (from store config).`));
@@ -168,10 +169,12 @@ async function runInitFlow() {
     }
   }
 
-  console.log(pc.cyan(`\n  Configure ${total} ${setter.name} secret(s)/variable(s). Leave optional ones blank to skip.\n`));
-  for (let i = 0; i < secretsToPrompt.length; i++) {
-    const secret = secretsToPrompt[i];
-    const value = await promptSecretValue(secret, i, total);
+  const toPrompt = secretsToPrompt.filter((s) => !alreadySet.has(s.name) || doUpdateExisting);
+  const totalToPrompt = toPrompt.length;
+  console.log(pc.cyan(`\n  Configure ${totalToPrompt} ${setter.name} secret(s)/variable(s). Leave optional ones blank to skip.\n`));
+  for (let i = 0; i < toPrompt.length; i++) {
+    const secret = toPrompt[i];
+    const value = await promptSecretValue(secret, i, totalToPrompt);
     if (!value) continue;
 
     const isThemeToken =

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;
 }