climaybe 3.0.3 → 3.0.5

package/bin/version.txt

@@ -1 +1 @@
-3.0.3
+3.0.5

package/package.json

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

package/src/commands/ensure-branches.js

@@ -6,6 +6,8 @@ import {
   currentBranch,
   ensureStagingBranch,
   createStoreBranches,
+  hasOriginRemote,
+  pushBranchesToOrigin,
 } from '../lib/git.js';
 
 /**
@@ -36,15 +38,26 @@ export async function ensureBranchesCommand() {
   console.log(pc.dim(`  Mode: ${mode}-store (${aliases.length} store(s))\n`));
 
   ensureStagingBranch();
+  const branchesToPush = ['staging'];
   for (const alias of aliases) {
     createStoreBranches(alias);
+    branchesToPush.push(`staging-${alias}`, `live-${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'));
-  for (const alias of aliases) {
-    console.log(pc.dim(`    git push origin staging-${alias} live-${alias}`));
+  if (hasOriginRemote()) {
+    try {
+      pushBranchesToOrigin(branchesToPush);
+      console.log(pc.green('  Pushed ensured branches to origin.\n'));
+    } catch (err) {
+      console.log(pc.yellow(`  Could not push branches automatically: ${err.message}`));
+      console.log(pc.dim('  Push them manually so CI can run:'));
+      console.log(pc.dim('    git push origin --all\n'));
+    }
+  } else {
+    console.log(pc.dim('  No origin remote found.'));
+    console.log(pc.dim('  Push them after adding a remote so CI can run:'));
+    console.log(pc.dim('    git remote add origin <url>'));
+    console.log(pc.dim('    git push origin --all\n'));
   }
-  console.log(pc.dim('  Or push all at once: git push origin --all\n'));
 }

package/src/lib/dev-runtime.js

@@ -1,12 +1,33 @@
 import { spawn } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { watchTree } from './watch.js';
-import { join } from 'node:path';
+import { isAbsolute, join, relative } 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 tagLabel(tag, color = (s) => s) {
+  return color(`[${tag}]`);
+}
+
+function writeTaggedLine(tag, color, line, stream = process.stdout) {
+  const text = String(line || '').trimEnd();
+  if (!text) return;
+  stream.write(`${tagLabel(tag, color)} ${text}\n`);
+}
+
+function writeTaggedChunk(tag, color, chunk, stream = process.stdout) {
+  for (const line of String(chunk || '').split('\n')) {
+    if (!line) continue;
+    writeTaggedLine(tag, color, line, stream);
+  }
+}
+
+function printServeStartupHeader() {
+  console.log(pc.bold('\n  climaybe — serve startup\n'));
+}
+
 function getPackageDir() {
   return process.env.CLIMAYBE_PACKAGE_DIR || process.cwd();
 }
@@ -16,21 +37,29 @@ function binPath(binName) {
   return join(getPackageDir(), 'node_modules', '.bin', binName);
 }
 
-function spawnLogged(command, args, { name, cwd = process.cwd(), env = process.env } = {}) {
+function spawnLogged(
+  command,
+  args,
+  { name, cwd = process.cwd(), env = process.env, stdio = 'inherit', tag = null, color = (s) => s } = {}
+) {
   const child = spawn(command, args, {
     cwd,
     env,
-    stdio: 'inherit',
+    stdio,
     shell: process.platform === 'win32',
   });
+  if (stdio === 'pipe') {
+    if (child.stdout) child.stdout.on('data', (buf) => writeTaggedChunk(tag || name, color, String(buf), process.stdout));
+    if (child.stderr) child.stderr.on('data', (buf) => writeTaggedChunk(tag || name, color, String(buf), process.stderr));
+  }
 
   child.on('exit', (code, signal) => {
     if (signal) {
-      console.log(pc.yellow(`\n  ${name} exited with signal ${signal}\n`));
+      writeTaggedLine(tag || name, color, `exited with signal ${signal}`);
       return;
     }
     if (code && code !== 0) {
-      console.log(pc.red(`\n  ${name} exited with code ${code}\n`));
+      writeTaggedLine(tag || name, color, `exited with code ${code}`, process.stderr);
     }
   });
 
@@ -41,7 +70,7 @@ function runTailwind(args, { cwd = process.cwd(), env = process.env, name = 'tai
   return spawnLogged(
     'npx',
     ['-y', '--package', '@tailwindcss/cli@latest', '--package', 'tailwindcss@latest', 'tailwindcss', ...args],
-    { name, cwd, env }
+    { name, cwd, env, stdio: 'pipe', tag: 'tailwind', color: pc.blue }
   );
 }
 
@@ -63,20 +92,143 @@ function safeKill(child) {
   }
 }
 
+function writeThemeCheckErrorsOnly(chunk, stream = process.stdout) {
+  for (const line of String(chunk || '').split('\n')) {
+    if (!line) continue;
+    if (/warning/i.test(line)) continue;
+    writeTaggedLine('theme-check', pc.red, line, stream);
+  }
+}
+
+function collectThemeCheckOffenses(payload) {
+  const out = [];
+  const visit = (value, inheritedPath = '') => {
+    if (!value) return;
+    if (Array.isArray(value)) {
+      for (const item of value) visit(item, inheritedPath);
+      return;
+    }
+    if (typeof value !== 'object') return;
+
+    const localPath =
+      value.path ||
+      value.file ||
+      value.file_path ||
+      value.relative_path ||
+      value.source ||
+      inheritedPath ||
+      '';
+
+    if (typeof value.severity === 'string' && typeof value.message === 'string') {
+      out.push({ ...value, __path: localPath || inheritedPath || '' });
+      return;
+    }
+
+    if (Array.isArray(value.offenses)) {
+      for (const offense of value.offenses) visit(offense, localPath || inheritedPath);
+    }
+    if (Array.isArray(value.checks)) {
+      for (const check of value.checks) visit(check, localPath || inheritedPath);
+    }
+
+    for (const nested of Object.values(value)) visit(nested, localPath || inheritedPath);
+  };
+  visit(payload);
+  return out;
+}
+
+function normalizeThemeCheckPath(file, cwd) {
+  const raw = String(file || '').trim();
+  if (!raw) return 'unknown';
+  if (isAbsolute(raw)) {
+    const rel = relative(cwd, raw);
+    if (rel && !rel.startsWith('..')) return rel;
+  }
+  return raw;
+}
+
+function formatThemeCheckError(offense, { cwd = process.cwd() } = {}) {
+  const file = offense.__path || offense.path || offense.file || offense.file_path || offense.relative_path || 'unknown';
+  const line =
+    offense.start_line ||
+    offense.startLine ||
+    offense.line ||
+    offense.line_number ||
+    offense.start_row ||
+    offense.row ||
+    '?';
+  const check = offense.check || offense.check_name || 'theme-check';
+  const message = offense.message || '';
+  const safeFile = normalizeThemeCheckPath(file, cwd);
+  return `${pc.cyan(safeFile)}:${pc.yellow(String(line))} ${pc.magenta(`[${check}]`)} ${pc.white(message)}`;
+}
+
+function runThemeCheckFiltered({ cwd = process.cwd() } = {}) {
+  let stdout = '';
+  let stderr = '';
+  const child = runShopify(['theme', 'check', '--fail-level', 'error', '--output', 'json'], {
+    cwd,
+    name: 'theme-check',
+    stdio: 'pipe',
+    onStdout: (chunk) => {
+      stdout += String(chunk || '');
+    },
+    onStderr: (chunk) => {
+      stderr += String(chunk || '');
+    },
+  });
+  child.on('exit', () => {
+    const trimmed = stdout.trim();
+    if (trimmed) {
+      try {
+        const parsed = JSON.parse(trimmed);
+        const offenses = collectThemeCheckOffenses(parsed).filter(
+          (offense) => String(offense.severity || '').toLowerCase() === 'error'
+        );
+        const seen = new Set();
+        for (const offense of offenses) {
+          const key = JSON.stringify([
+            offense.__path || offense.path || offense.file || offense.file_path || offense.relative_path || '',
+            offense.start_line || offense.startLine || offense.line || offense.line_number || offense.start_row || offense.row || '',
+            offense.check || offense.check_name || '',
+            offense.message || '',
+          ]);
+          if (seen.has(key)) continue;
+          seen.add(key);
+          writeTaggedLine('theme-check', pc.red, formatThemeCheckError(offense, { cwd }), process.stderr);
+        }
+      } catch {
+        writeThemeCheckErrorsOnly(stdout, process.stdout);
+      }
+    }
+    if (stderr.trim()) {
+      writeThemeCheckErrorsOnly(stderr, process.stderr);
+    }
+  });
+  return child;
+}
+
 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}`);
+  // Keep Shopify on inherited stdio so reconciliation prompts remain interactive.
   return runShopify(args, { cwd, name: 'shopify' });
 }
 
 export function serveAssets({ cwd = process.cwd(), includeThemeCheck = true } = {}) {
+  printServeStartupHeader();
   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;
+  if (!tailwind) {
+    writeTaggedLine('tailwind', pc.blue, 'skipped (missing _styles/main.css)');
+  } else {
+    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 });
@@ -85,10 +237,12 @@ export function serveAssets({ cwd = process.cwd(), includeThemeCheck = true } =
   if (existsSync(scriptsDir)) {
     try {
       buildScripts({ cwd });
-      console.log(pc.green('  scripts built (initial)'));
+      writeTaggedLine('scripts', pc.yellow, 'built (initial)');
     } catch (err) {
-      console.log(pc.red(`  initial scripts build failed: ${err.message}`));
+      writeTaggedLine('scripts', pc.yellow, `initial build failed: ${err.message}`, process.stderr);
     }
+  } else {
+    writeTaggedLine('scripts', pc.yellow, 'skipped (missing _scripts/)');
   }
   const scriptsWatch = existsSync(scriptsDir)
     ? watchTree({
@@ -98,9 +252,9 @@ export function serveAssets({ cwd = process.cwd(), includeThemeCheck = true } =
         onChange: () => {
           try {
             buildScripts({ cwd });
-            console.log(pc.green('  scripts rebuilt'));
+            writeTaggedLine('scripts', pc.yellow, 'rebuilt');
           } catch (err) {
-            console.log(pc.red(`  scripts build failed: ${err.message}`));
+            writeTaggedLine('scripts', pc.yellow, `build failed: ${err.message}`, process.stderr);
           }
         },
       })
@@ -114,7 +268,7 @@ export function serveAssets({ cwd = process.cwd(), includeThemeCheck = true } =
       return;
     }
     themeCheckRunning = true;
-    const child = runShopify(['theme', 'check'], { cwd, name: 'theme-check' });
+    const child = runThemeCheckFiltered({ cwd });
     child.on('exit', () => {
       themeCheckRunning = false;
       if (themeCheckQueued) {
@@ -142,7 +296,10 @@ export function serveAssets({ cwd = process.cwd(), includeThemeCheck = true } =
       : null;
 
   if (includeThemeCheck) {
+    writeTaggedLine('theme-check', pc.red, 'running initial scan (errors only)');
     runThemeCheck();
+  } else {
+    writeTaggedLine('theme-check', pc.red, 'disabled');
   }
 
   const cleanup = () => {
@@ -156,12 +313,21 @@ export function serveAssets({ cwd = process.cwd(), includeThemeCheck = true } =
 }
 
 export function serveAll({ cwd = process.cwd(), includeThemeCheck = true } = {}) {
-  // Keep Shopify CLI in the foreground (real TTY), and run watchers in background.
+  // Start assets first, then bring up Shopify after a short delay.
   const assets = serveAssets({ cwd, includeThemeCheck });
-  const shopify = serveShopify({ cwd });
+  let shopify = null;
+  const shopifyStartDelayMs = 2500;
+  const shopifyTimer = setTimeout(() => {
+    shopify = serveShopify({ cwd });
+    shopify.on('exit', () => {
+      cleanup();
+    });
+  }, shopifyStartDelayMs);
+  console.log(pc.dim(`  Waiting ${shopifyStartDelayMs}ms before starting Shopify...`));
 
   const cleanup = () => {
-    assets.cleanup?.();
+    clearTimeout(shopifyTimer);
+    assets?.cleanup?.();
     safeKill(shopify);
   };
 
@@ -169,11 +335,7 @@ export function serveAll({ cwd = process.cwd(), includeThemeCheck = true } = {})
   process.once('SIGINT', handleSignal);
   process.once('SIGTERM', handleSignal);
 
-  shopify.on('exit', () => {
-    cleanup();
-  });
-
-  return { shopify, ...assets, cleanup };
+  return { cleanup };
 }
 
 export function lintAll({ cwd = process.cwd() } = {}) {
@@ -187,7 +349,7 @@ export function lintAll({ cwd = process.cwd() } = {}) {
     ['./assets/*.css', '--config', '.config/.stylelintrc.json'],
     { name: 'stylelint', cwd }
   );
-  const themeCheck = runShopify(['theme', 'check'], { cwd, name: 'theme-check' });
+  const themeCheck = runThemeCheckFiltered({ cwd });
   return { eslint, stylelint, themeCheck };
 }
 

package/src/lib/git.js

@@ -107,6 +107,28 @@ export function ensureGitRepo(cwd = process.cwd()) {
   }
 }
 
+/**
+ * Check if origin remote exists.
+ */
+export function hasOriginRemote(cwd = process.cwd()) {
+  try {
+    exec('git remote get-url origin', cwd);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Push branches to origin if remote exists.
+ */
+export function pushBranchesToOrigin(branches = [], cwd = process.cwd()) {
+  if (!branches.length) return true;
+  const unique = [...new Set(branches)];
+  exec(`git push origin ${unique.join(' ')}`, cwd);
+  return true;
+}
+
 /**
  * Get the latest tag version (e.g. "1.2.3") from v* tags, or null if none.
  * Sorts by version so v2.0.0 > v1.9.9.

package/src/lib/shopify-cli.js

@@ -1,15 +1,23 @@
 import { spawn } from 'node:child_process';
 import pc from 'picocolors';
 
-function spawnInherit(cmd, args, { cwd = process.cwd(), name = cmd } = {}) {
+function spawnShopify(
+  cmd,
+  args,
+  { cwd = process.cwd(), name = cmd, stdio = 'inherit', onStdout, onStderr } = {}
+) {
   const child = spawn(cmd, args, {
     cwd,
-    stdio: 'inherit',
+    stdio,
     shell: process.platform === 'win32',
   });
+  if (stdio === 'pipe') {
+    if (child.stdout && onStdout) child.stdout.on('data', (buf) => onStdout(String(buf)));
+    if (child.stderr && onStderr) child.stderr.on('data', (buf) => onStderr(String(buf)));
+  }
   child.on('exit', (code) => {
     if (code && code !== 0) {
-      console.log(pc.red(`\n  ${name} exited with code ${code}\n`));
+      console.log(pc.red(`\n  [${name}] exited with code ${code}\n`));
     }
   });
   return child;
@@ -19,11 +27,17 @@ function spawnInherit(cmd, args, { cwd = process.cwd(), name = cmd } = {}) {
  * 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 });
+export function runShopify(args, { cwd = process.cwd(), name = 'shopify', stdio = 'inherit', onStdout, onStderr } = {}) {
+  const child = spawnShopify('shopify', args, { cwd, name, stdio, onStdout, onStderr });
   child.on('error', (err) => {
     if (err?.code !== 'ENOENT') return;
-    spawnInherit('npx', ['-y', '@shopify/cli@latest', ...args], { cwd, name: 'shopify(npx)' });
+    spawnShopify('npx', ['-y', '@shopify/cli@latest', ...args], {
+      cwd,
+      name: 'shopify(npx)',
+      stdio,
+      onStdout,
+      onStderr,
+    });
   });
   return child;
 }