climaybe 2.4.1 → 3.0.0

package/src/lib/dev-runtime.js

@@ -0,0 +1,188 @@
+import { spawn } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { watchTree } from './watch.js';
+import { join } from 'node:path';
+import pc from 'picocolors';
+import { readConfig } from './config.js';
+import { buildScripts } from './build-scripts.js';
+import { runShopify } from './shopify-cli.js';
+
+function getPackageDir() {
+  return process.env.CLIMAYBE_PACKAGE_DIR || process.cwd();
+}
+
+function binPath(binName) {
+  // Resolve to this package's bundled .bin (works for npx + installed package).
+  return join(getPackageDir(), 'node_modules', '.bin', binName);
+}
+
+function spawnLogged(command, args, { name, cwd = process.cwd(), env = process.env } = {}) {
+  const child = spawn(command, args, {
+    cwd,
+    env,
+    stdio: 'inherit',
+    shell: process.platform === 'win32',
+  });
+
+  child.on('exit', (code, signal) => {
+    if (signal) {
+      console.log(pc.yellow(`\n  ${name} exited with signal ${signal}\n`));
+      return;
+    }
+    if (code && code !== 0) {
+      console.log(pc.red(`\n  ${name} exited with code ${code}\n`));
+    }
+  });
+
+  return child;
+}
+
+function runTailwind(args, { cwd = process.cwd(), env = process.env, name = 'tailwind' } = {}) {
+  return spawnLogged(
+    'npx',
+    ['-y', '--package', '@tailwindcss/cli@latest', '--package', 'tailwindcss@latest', 'tailwindcss', ...args],
+    { name, cwd, env }
+  );
+}
+
+function safeClose(w) {
+  if (!w) return;
+  try {
+    w.close?.();
+  } catch {
+    // ignore
+  }
+}
+
+function safeKill(child) {
+  if (!child || typeof child.kill !== 'function') return;
+  try {
+    child.kill('SIGTERM');
+  } catch {
+    // ignore
+  }
+}
+
+export function serveShopify({ cwd = process.cwd() } = {}) {
+  const config = readConfig(cwd) || {};
+  const store = config.default_store || config.store || '';
+  const args = ['theme', 'dev', '--theme-editor-sync'];
+  if (store) args.push(`--store=${store}`);
+  return runShopify(args, { cwd, name: 'shopify' });
+}
+
+export function serveAssets({ cwd = process.cwd(), includeThemeCheck = true } = {}) {
+  const env = { ...process.env, NODE_ENV: 'production' };
+  const styleEntrypoint = join(cwd, '_styles', 'main.css');
+  const tailwind = existsSync(styleEntrypoint)
+    ? runTailwind(['-i', '_styles/main.css', '-o', 'assets/style.css', '--watch'], { cwd, env, name: 'tailwind' })
+    : null;
+
+  // Optional dev MCP (non-blocking if missing)
+  const devMcp = spawnLogged('npx', ['-y', '@shopify/dev-mcp@latest'], { name: 'dev-mcp', cwd });
+
+  const scriptsDir = join(cwd, '_scripts');
+  if (existsSync(scriptsDir)) {
+    try {
+      buildScripts({ cwd });
+      console.log(pc.green('  scripts built (initial)'));
+    } catch (err) {
+      console.log(pc.red(`  initial scripts build failed: ${err.message}`));
+    }
+  }
+  const scriptsWatch = existsSync(scriptsDir)
+    ? watchTree({
+        rootDir: scriptsDir,
+        ignore: (p) => p.includes('node_modules') || p.includes('/assets/') || p.includes('/.git/'),
+        debounceMs: 300,
+        onChange: () => {
+          try {
+            buildScripts({ cwd });
+            console.log(pc.green('  scripts rebuilt'));
+          } catch (err) {
+            console.log(pc.red(`  scripts build failed: ${err.message}`));
+          }
+        },
+      })
+    : null;
+
+  const themeCheckWatch =
+    includeThemeCheck
+      ? watchTree({
+          rootDir: cwd,
+          ignore: (p) =>
+            p.includes('/node_modules/') ||
+            p.includes('/assets/') ||
+            p.includes('/.git/') ||
+            p.includes('/_scripts/') ||
+            p.includes('/_styles/'),
+          debounceMs: 800,
+          onChange: () => {
+            runShopify(['theme', 'check'], { cwd, name: 'theme-check' });
+          },
+        })
+      : null;
+
+  const cleanup = () => {
+    safeClose(scriptsWatch);
+    safeClose(themeCheckWatch);
+    safeKill(tailwind);
+    safeKill(devMcp);
+  };
+
+  return { tailwind, devMcp, scriptsWatch, themeCheckWatch, cleanup };
+}
+
+export function serveAll({ cwd = process.cwd(), includeThemeCheck = true } = {}) {
+  // Keep Shopify CLI in the foreground (real TTY), and run watchers in background.
+  const assets = serveAssets({ cwd, includeThemeCheck });
+  const shopify = serveShopify({ cwd });
+
+  const cleanup = () => {
+    assets.cleanup?.();
+    safeKill(shopify);
+  };
+
+  const handleSignal = () => cleanup();
+  process.once('SIGINT', handleSignal);
+  process.once('SIGTERM', handleSignal);
+
+  shopify.on('exit', () => {
+    cleanup();
+  });
+
+  return { shopify, ...assets, cleanup };
+}
+
+export function lintAll({ cwd = process.cwd() } = {}) {
+  // Keep these intentionally simple wrappers; users can run the underlying tools directly if desired.
+  const eslint = spawnLogged(binPath('eslint'), ['./assets/*.js', '--config', '.config/eslint.config.mjs'], {
+    name: 'eslint',
+    cwd,
+  });
+  const stylelint = spawnLogged(
+    binPath('stylelint'),
+    ['./assets/*.css', '--config', '.config/.stylelintrc.json'],
+    { name: 'stylelint', cwd }
+  );
+  const themeCheck = runShopify(['theme', 'check'], { cwd, name: 'theme-check' });
+  return { eslint, stylelint, themeCheck };
+}
+
+export function buildAll({ cwd = process.cwd() } = {}) {
+  const env = { ...process.env, NODE_ENV: 'production' };
+  let scriptsOk = true;
+  try {
+    buildScripts({ cwd });
+  } catch (err) {
+    console.log(pc.red(`\n  build-scripts failed: ${err.message}\n`));
+    scriptsOk = false;
+  }
+  const tailwind = runTailwind(['-i', '_styles/main.css', '-o', 'assets/style.css', '--minify'], {
+    cwd,
+    env,
+    name: 'tailwind',
+  });
+  return { scriptsOk, tailwind };
+}
+

package/src/lib/prompts.js

@@ -1,5 +1,6 @@
 import prompts from 'prompts';
 import pc from 'picocolors';
+import { basename } from 'node:path';
 
 /**
  * Extract the subdomain (storeKey) from a Shopify domain.
@@ -42,13 +43,13 @@ export async function promptStore(defaultDomain = '') {
   const { domain } = await prompts({
     type: 'text',
     name: 'domain',
-    message: 'Store URL',
+    message: 'Store name or domain',
     initial: defaultDomain,
     validate: (v) => {
-      if (v.trim().length === 0) return 'Store URL is required';
+      if (v.trim().length === 0) return 'Store name is required';
       const normalized = normalizeDomain(v);
       if (!normalized || !isValidShopifyDomain(normalized)) {
-        return 'Enter a valid Shopify domain (e.g. voldt-staging.myshopify.com)';
+        return 'Enter a valid store name or domain (e.g. voldt-staging or voldt-staging.myshopify.com)';
       }
       return true;
     },
@@ -149,14 +150,14 @@ export async function promptBuildWorkflows() {
 }
 
 /**
- * Ask whether to scaffold the local theme dev kit files (scripts, lint, ignores, editor tasks).
+ * Ask whether to scaffold local theme dev-kit files (configs, ignores, editor tasks).
  */
 export async function promptDevKit() {
   const { enableDevKit } = await prompts({
     type: 'confirm',
     name: 'enableDevKit',
     message:
-      'Install Electric Maybe theme dev kit? (local scripts/watch/lint configs, ignores, and optional VS Code tasks)',
+      'Install Electric Maybe theme dev kit? (local dev config files, ignore defaults, and optional VS Code tasks)',
     initial: true,
   });
 
@@ -170,7 +171,7 @@ export async function promptVSCodeDevTasks() {
   const { enableVSCodeTasks } = await prompts({
     type: 'confirm',
     name: 'enableVSCodeTasks',
-    message: 'Add VS Code tasks.json to auto-run Shopify + Tailwind local dev tasks?',
+    message: 'Add VS Code tasks.json to auto-run climaybe local dev commands (Shopify + assets watch)?',
     initial: true,
   });
 
@@ -206,6 +207,28 @@ export async function promptCursorSkills() {
   return !!enableCursorSkills;
 }
 
+/**
+ * Prompt for package.json name when creating a new package.json.
+ */
+export async function promptProjectName(cwd = process.cwd()) {
+  const suggested = basename(cwd).trim().toLowerCase().replace(/\s+/g, '-');
+  const { projectName } = await prompts({
+    type: 'text',
+    name: 'projectName',
+    message: 'Project name for package.json',
+    initial: suggested || 'shopify-theme',
+    validate: (v) => {
+      const name = String(v || '').trim();
+      if (!name) return 'Project name is required';
+      if (!/^[a-z0-9][a-z0-9._-]*$/.test(name)) {
+        return 'Use lowercase letters, numbers, dot, underscore, or hyphen';
+      }
+      return true;
+    },
+  });
+  return String(projectName || '').trim();
+}
+
 /**
  * Prompt for a single new store (used by add-store command).
  * Takes existing aliases to prevent duplicates.

package/src/lib/shopify-cli.js

@@ -0,0 +1,30 @@
+import { spawn } from 'node:child_process';
+import pc from 'picocolors';
+
+function spawnInherit(cmd, args, { cwd = process.cwd(), name = cmd } = {}) {
+  const child = spawn(cmd, args, {
+    cwd,
+    stdio: 'inherit',
+    shell: process.platform === 'win32',
+  });
+  child.on('exit', (code) => {
+    if (code && code !== 0) {
+      console.log(pc.red(`\n  ${name} exited with code ${code}\n`));
+    }
+  });
+  return child;
+}
+
+/**
+ * Run Shopify CLI, falling back to npx when `shopify` isn't available.
+ * @param {string[]} args e.g. ['theme','check']
+ */
+export function runShopify(args, { cwd = process.cwd(), name = 'shopify' } = {}) {
+  const child = spawnInherit('shopify', args, { cwd, name });
+  child.on('error', (err) => {
+    if (err?.code !== 'ENOENT') return;
+    spawnInherit('npx', ['-y', '@shopify/cli@latest', ...args], { cwd, name: 'shopify(npx)' });
+  });
+  return child;
+}
+

package/src/lib/theme-dev-kit.js

@@ -1,21 +1,8 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { join, dirname } from 'node:path';
-import { readPkg, writePkg } from './config.js';
+import { readPkg, writePkg, writeClimaybeConfig } from './config.js';
 
 const DEV_KIT_FILES = {
-  'nodemon.json': `{
-  "watch": ["_scripts"],
-  "ext": "js",
-  "exec": "npm run scripts:build --silent",
-  "quiet": true,
-  "no-colours": true,
-  "ignore": ["node_modules/**/*", "assets/**/*", "**/*.min.js"],
-  "delay": "500",
-  "polling": false,
-  "legacyWatch": false,
-  "restartable": "rs"
-}
-`,
   '.theme-check.yml': `root: .
 
 extends: :nothing
@@ -80,7 +67,7 @@ const VSCODE_TASKS_CONTENT = `{
     {
       "label": "Shopify",
       "type": "shell",
-      "command": "yarn shopify:serve",
+      "command": "climaybe serve:shopify",
       "isBackground": true,
       "presentation": {
         "echo": true,
@@ -96,7 +83,7 @@ const VSCODE_TASKS_CONTENT = `{
     {
       "label": "Tailwind",
       "type": "shell",
-      "command": "yarn tailwind:watch",
+      "command": "climaybe serve:assets",
       "isBackground": true,
       "presentation": {
         "echo": true,
@@ -128,33 +115,6 @@ assets/index.js
 .vercel
 `;
 
-const PACKAGE_MERGES = {
-  scripts: {
-    'shopify:serve': 'shopify theme dev --theme-editor-sync --store=$npm_package_config_store',
-    'shopify:populate': 'shopify populate --store=$npm_package_config_store',
-    'scripts:build': 'node build-scripts.js',
-    'scripts:watch': 'nodemon',
-    'tailwind:watch':
-      `concurrently --kill-others --max-restarts 3 "NODE_ENV=production NODE_OPTIONS='--max-old-space-size=512' ` +
-      `npx @tailwindcss/cli -i _styles/main.css -o assets/style.css --watch" "NODE_OPTIONS='--max-old-space-size=256' ` +
-      `npm run scripts:watch" "npx -y @shopify/dev-mcp@latest"`,
-    'tailwind:build': 'NODE_ENV=production npx @tailwindcss/cli -i _styles/main.css -o assets/style.css --minify && npm run scripts:build',
-    'lint:liquid': 'shopify theme check',
-    'lint:js': 'eslint ./assets/*.js --config .config/eslint.config.mjs',
-    'lint:css': 'node_modules/.bin/stylelint ./assets/*.css --config .config/.stylelintrc.json',
-    release: 'node .sys/scripts/release.js',
-  },
-  devDependencies: {
-    '@shopify/prettier-plugin-liquid': '^1.6.3',
-    '@tailwindcss/cli': '^4.1.17',
-    concurrently: '^8.2.2',
-    nodemon: '^3.0.2',
-    prettier: '^3.4.2',
-    stylelint: '^16.9.0',
-    eslint: '^9.11.0',
-  },
-};
-
 function ensureParent(path) {
   mkdirSync(dirname(path), { recursive: true });
 }
@@ -171,12 +131,16 @@ function mergeGitignore(cwd = process.cwd()) {
   writeFileSync(path, `${next}\n`, 'utf-8');
 }
 
-function mergePackageJson(defaultStoreDomain = '', cwd = process.cwd()) {
-  const pkg = readPkg(cwd) || { name: 'shopify-theme', version: '1.0.0', private: true };
-  pkg.config = { ...(pkg.config || {}) };
-  if (!pkg.config.store && defaultStoreDomain) pkg.config.store = defaultStoreDomain;
-  pkg.scripts = { ...(pkg.scripts || {}), ...PACKAGE_MERGES.scripts };
-  pkg.devDependencies = { ...(pkg.devDependencies || {}), ...PACKAGE_MERGES.devDependencies };
+function mergePackageJson({ packageName = 'shopify-theme', cwd = process.cwd() } = {}) {
+  const pkg = readPkg(cwd) || { name: packageName, version: '1.0.0', private: true };
+  pkg.devDependencies = { ...(pkg.devDependencies || {}) };
+
+  // Ensure teammates can run climaybe + Tailwind after plain npm install.
+  const cliVersion = process.env.CLIMAYBE_PACKAGE_VERSION;
+  const climaybeRange = /^\d+\.\d+\.\d+/.test(String(cliVersion || '')) ? `^${cliVersion}` : 'latest';
+  if (!pkg.devDependencies.climaybe) pkg.devDependencies.climaybe = climaybeRange;
+  if (!pkg.devDependencies.tailwindcss) pkg.devDependencies.tailwindcss = 'latest';
+
   writePkg(pkg, cwd);
 }
 
@@ -186,7 +150,12 @@ export function getDevKitExistingFiles({ includeVSCodeTasks = true, cwd = proces
   return paths.filter((p) => existsSync(join(cwd, p)));
 }
 
-export function scaffoldThemeDevKit({ includeVSCodeTasks = true, defaultStoreDomain = '', cwd = process.cwd() } = {}) {
+export function scaffoldThemeDevKit({
+  includeVSCodeTasks = true,
+  defaultStoreDomain = '',
+  packageName = 'shopify-theme',
+  cwd = process.cwd(),
+} = {}) {
   for (const [rel, content] of Object.entries(DEV_KIT_FILES)) {
     const dest = join(cwd, rel);
     ensureParent(dest);
@@ -198,5 +167,18 @@ export function scaffoldThemeDevKit({ includeVSCodeTasks = true, defaultStoreDom
     writeFileSync(dest, VSCODE_TASKS_CONTENT, 'utf-8');
   }
   mergeGitignore(cwd);
-  mergePackageJson(defaultStoreDomain, cwd);
+  mergePackageJson({ packageName, cwd });
+
+  // New source-of-truth config file for climaybe (local dev + CI).
+  // We intentionally keep package.json changes minimal (no script injection).
+  writeClimaybeConfig(
+    {
+      port: 9295,
+      default_store: defaultStoreDomain || undefined,
+      dev_kit: true,
+      vscode_tasks: includeVSCodeTasks,
+      project_type: 'theme',
+    },
+    cwd
+  );
 }

package/src/lib/watch.js

@@ -0,0 +1,80 @@
+import { existsSync, readdirSync, watch } from 'node:fs';
+import { join } from 'node:path';
+
+function debounce(fn, ms) {
+  let t = null;
+  return (...args) => {
+    if (t) clearTimeout(t);
+    t = setTimeout(() => fn(...args), ms);
+  };
+}
+
+function listDirsRecursively(rootDir) {
+  const dirs = [];
+  if (!existsSync(rootDir)) return dirs;
+
+  const stack = [rootDir];
+  while (stack.length) {
+    const dir = stack.pop();
+    dirs.push(dir);
+    let entries = [];
+    try {
+      entries = readdirSync(dir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const e of entries) {
+      if (!e.isDirectory()) continue;
+      const full = join(dir, e.name);
+      stack.push(full);
+    }
+  }
+  return dirs;
+}
+
+export function watchTree({ rootDir, ignore = () => false, onChange, debounceMs = 300 } = {}) {
+  if (!rootDir) throw new Error('watchTree: rootDir is required');
+  if (typeof onChange !== 'function') throw new Error('watchTree: onChange is required');
+  if (!existsSync(rootDir)) return { close: () => {} };
+
+  const watchers = new Map();
+  const debounced = debounce(onChange, debounceMs);
+
+  function ensureWatched(dir) {
+    if (watchers.has(dir)) return;
+    try {
+      const w = watch(dir, { persistent: true }, (eventType, filename) => {
+        const name = typeof filename === 'string' ? filename : '';
+        const full = name ? join(dir, name) : dir;
+        if (ignore(full)) return;
+        debounced(full, eventType);
+        // Best-effort: new dirs can appear; rescan on any event.
+        rescan();
+      });
+      watchers.set(dir, w);
+    } catch {
+      // ignore unwatcheable dirs
+    }
+  }
+
+  function rescan() {
+    const dirs = listDirsRecursively(rootDir);
+    for (const d of dirs) ensureWatched(d);
+  }
+
+  rescan();
+
+  return {
+    close() {
+      for (const w of watchers.values()) {
+        try {
+          w.close();
+        } catch {
+          // ignore
+        }
+      }
+      watchers.clear();
+    },
+  };
+}
+

package/src/lib/workflows.js

@@ -2,7 +2,7 @@ import { existsSync, mkdirSync, readdirSync, copyFileSync, rmSync } from 'node:f
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import pc from 'picocolors';
-import { installBuildScript, removeBuildScript } from './build-workflows.js';
+import { ensureBuildWorkflowDefaults } from './build-workflows.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const TEMPLATES_DIR = join(__dirname, '..', 'workflows');
@@ -110,9 +110,7 @@ export function scaffoldWorkflows(mode = 'single', options = {}, cwd = process.c
     for (const f of listYmls(buildDir)) {
       copyWorkflow(buildDir, f, dest);
     }
-    installBuildScript(cwd);
-  } else {
-    removeBuildScript(cwd);
+    ensureBuildWorkflowDefaults(cwd);
   }
 
   const total = readdirSync(dest).filter((f) => f.endsWith('.yml')).length;

package/src/workflows/build/create-release.yml

@@ -119,9 +119,18 @@ jobs:
             COMMITS=$(git log --pretty=format:"%s" -n 30 "$TAG_NAME" 2>/dev/null || true)
           fi
 
+          # Filter out noisy system-generated sync/merge commits so release notes stay readable.
+          FILTERED_COMMITS=$(printf '%s\n' "$COMMITS" | sed '/^[[:space:]]*$/d' | grep -Eiv \
+            '^Sync main → staging-|^Sync main -> staging-|^Merge pull request #|^Merge branch |^Merge live-.* into main \[hotfix-backport\]$|^chore: sync root to stores/.+ \[root-to-stores\]$|^chore: keep store root JSONs from stores/.+ \[stores-to-root\]$|^Update from Shopify for theme ')
+          if [ -z "$FILTERED_COMMITS" ]; then
+            NOISY_ONLY_COMMITS=true
+          else
+            NOISY_ONLY_COMMITS=false
+          fi
+
           # Score how many commit subjects follow conventional-commit style.
-          TOTAL_COUNT=$(printf '%s\n' "$COMMITS" | sed '/^[[:space:]]*$/d' | wc -l | tr -d ' ')
-          CONVENTIONAL_COUNT=$(printf '%s\n' "$COMMITS" | sed '/^[[:space:]]*$/d' | grep -Eic '^(feat|fix|refactor|perf|docs|style|test|build|ci|chore|revert)(\([^)]+\))?!?: ')
+          TOTAL_COUNT=$(printf '%s\n' "$FILTERED_COMMITS" | sed '/^[[:space:]]*$/d' | wc -l | tr -d ' ')
+          CONVENTIONAL_COUNT=$(printf '%s\n' "$FILTERED_COMMITS" | sed '/^[[:space:]]*$/d' | grep -Eic '^(feat|fix|refactor|perf|docs|style|test|build|ci|chore|revert)(\([^)]+\))?!?: ')
           if [ -z "$TOTAL_COUNT" ] || [ "$TOTAL_COUNT" -eq 0 ]; then
             TOTAL_COUNT=1
           fi
@@ -139,8 +148,8 @@ jobs:
           } > "$NOTES_FILE"
 
           # If commit quality is low and Gemini is available, ask AI to summarize merchant-facing notes.
-          if [ "$QUALITY" -lt 50 ] && [ -n "$GEMINI_API_KEY" ]; then
-            printf '%s\n' "$COMMITS" > .sys/release-notes/commits-for-ai.txt
+          if [ "$QUALITY" -lt 50 ] && [ -n "$GEMINI_API_KEY" ] && [ "$NOISY_ONLY_COMMITS" != "true" ]; then
+            printf '%s\n' "$FILTERED_COMMITS" > .sys/release-notes/commits-for-ai.txt
 
             PROMPT=$(cat <<'PROMPT_EOF'
           You generate release notes for a Shopify theme.
@@ -182,12 +191,20 @@ jobs:
             else
               echo "## Changes" >> "$NOTES_FILE"
               echo >> "$NOTES_FILE"
-              printf '%s\n' "$COMMITS" | sed '/^[[:space:]]*$/d' | sed 's/^/- /' >> "$NOTES_FILE"
+              if [ "$NOISY_ONLY_COMMITS" = "true" ]; then
+                echo "- No notable merchant-facing changes in this release." >> "$NOTES_FILE"
+              else
+                printf '%s\n' "$FILTERED_COMMITS" | sed '/^[[:space:]]*$/d' | sed 's/^/- /' >> "$NOTES_FILE"
+              fi
             fi
           else
             echo "## Changes" >> "$NOTES_FILE"
             echo >> "$NOTES_FILE"
-            printf '%s\n' "$COMMITS" | sed '/^[[:space:]]*$/d' | sed 's/^/- /' >> "$NOTES_FILE"
+            if [ "$NOISY_ONLY_COMMITS" = "true" ]; then
+              echo "- No notable merchant-facing changes in this release." >> "$NOTES_FILE"
+            else
+              printf '%s\n' "$FILTERED_COMMITS" | sed '/^[[:space:]]*$/d' | sed 's/^/- /' >> "$NOTES_FILE"
+            fi
           fi
 
           echo "notes_file=$NOTES_FILE" >> $GITHUB_OUTPUT

package/src/workflows/build/reusable-build.yml

@@ -24,16 +24,32 @@ jobs:
           node-version: "24"
           cache: "npm"
 
-      - name: Install dependencies
-        run: npm ci
+      - name: Detect build entrypoints
+        id: detect
+        run: |
+          HAS_SCRIPTS=false
+          if ls _scripts/*.js >/dev/null 2>&1; then
+            HAS_SCRIPTS=true
+          fi
+          HAS_STYLES=false
+          if [ -f "_styles/main.css" ]; then
+            HAS_STYLES=true
+          fi
+          echo "has_scripts=$HAS_SCRIPTS" >> $GITHUB_OUTPUT
+          echo "has_styles=$HAS_STYLES" >> $GITHUB_OUTPUT
 
       - name: Build scripts
-        run: node .climaybe/build-scripts.js
+        if: steps.detect.outputs.has_scripts == 'true'
+        run: npx -y climaybe@latest build-scripts
 
       - name: Run Tailwind build
         id: build
         run: |
-          NODE_ENV=production npx @tailwindcss/cli -i _styles/main.css -o assets/style.css --minify
+          if [ "${{ steps.detect.outputs.has_styles }}" = "true" ]; then
+            NODE_ENV=production npx -y climaybe@latest build
+          else
+            echo "No _styles/main.css found; skipping Tailwind build."
+          fi
           echo "success=true" >> $GITHUB_OUTPUT
 
       - name: Commit and push changes
@@ -43,7 +59,12 @@ jobs:
           BRANCH_NAME=${{ github.head_ref || github.ref_name }}
           git fetch origin "$BRANCH_NAME" || echo "Branch does not exist yet"
           git checkout -B "$BRANCH_NAME" "origin/$BRANCH_NAME" 2>/dev/null || git checkout -B "$BRANCH_NAME"
-          git add -f assets/index.js assets/style.css
+          if ls assets/*.js >/dev/null 2>&1; then
+            git add -f assets/*.js
+          fi
+          if [ -f "assets/style.css" ]; then
+            git add -f assets/style.css
+          fi
           if git diff --staged --quiet; then
             echo "No changes to commit"
           else

package/src/workflows/multi/main-to-staging-stores.yml

@@ -68,7 +68,7 @@ jobs:
           fi
           echo "hotfix_skip_alias=$HOTFIX_SKIP_ALIAS" >> $GITHUB_OUTPUT
 
-  # Read store list from package.json
+  # Read store list from climaybe.config.json
   config:
     needs: gate
     if: needs.gate.outputs.should_run == 'true'
@@ -82,8 +82,9 @@ jobs:
         id: read
         run: |
           STORES=$(node -e "
-            const pkg = require('./package.json');
-            const stores = Object.keys(pkg.config?.stores || {});
+            const fs = require('fs');
+            const cfg = JSON.parse(fs.readFileSync('./climaybe.config.json', 'utf8'));
+            const stores = Object.keys(cfg?.stores || {});
             console.log(JSON.stringify(stores));
           ")
           echo "stores=$STORES" >> $GITHUB_OUTPUT
@@ -133,8 +134,14 @@ jobs:
 
           git fetch origin "$BRANCH"
           git checkout "$BRANCH"
-          git merge origin/main --no-ff -m "Sync main → $BRANCH" || true
-          if [ $? -ne 0 ]; then
+          BRANCH_TREE=$(git rev-parse HEAD^{tree} 2>/dev/null || echo "")
+          MAIN_TREE=$(git rev-parse origin/main^{tree} 2>/dev/null || echo "")
+          if [ -n "$BRANCH_TREE" ] && [ "$BRANCH_TREE" = "$MAIN_TREE" ]; then
+            echo "$BRANCH is already in sync with main (no-op), skipping."
+            exit 0
+          fi
+
+          if ! git merge origin/main --no-ff -m "Sync main → $BRANCH"; then
             echo "Merge had conflicts; aborting. Manual resolution may be needed."
             git merge --abort 2>/dev/null || true
             exit 1