@haposoft/cafekit 0.11.7 → 0.11.9

package/bin/lib/i18n.js

@@ -75,6 +75,7 @@ const MESSAGES = {
     chromiumInstalling:    'Downloading Chromium for chrome-devtools',
     chromiumReady:         'Chromium ready',
     chromiumSkipped:       'Chromium download skipped — chrome-devtools will prompt on first use.',
+    chromiumSystemChromeFound: 'System Chrome detected ({path}), skipping download',
     optionalToolsTitle:    'Optional tools to install manually',
 
     // Summary stats
@@ -180,6 +181,7 @@ const MESSAGES = {
     chromiumInstalling:    'chrome-devtools 用 Chromium をダウンロード中',
     chromiumReady:         'Chromium の準備ができました',
     chromiumSkipped:       'Chromium のダウンロードをスキップ — 初回使用時に chrome-devtools が自動取得します。',
+    chromiumSystemChromeFound: 'システムChromeを検出 ({path})、ダウンロードをスキップします',
     optionalToolsTitle:    '手動でインストールが必要なオプションツール',
 
     summaryTitle:    'インストール完了',
@@ -282,6 +284,7 @@ const MESSAGES = {
     chromiumInstalling:    'Đang tải Chromium cho chrome-devtools',
     chromiumReady:         'Chromium đã sẵn sàng',
     chromiumSkipped:       'Bỏ qua tải Chromium — chrome-devtools sẽ tự tải khi dùng lần đầu.',
+    chromiumSystemChromeFound: 'Đã phát hiện Chrome hệ thống ({path}), bỏ qua tải Chromium',
     optionalToolsTitle:    'Công cụ tuỳ chọn cần cài thủ công',
 
     summaryTitle:    'Cài đặt hoàn tất',

package/bin/lib/skill-deps.js

@@ -13,11 +13,11 @@
 
 const fs = require('fs');
 const path = require('path');
-const { spawnSync } = require('child_process');
+const { spawnSync, spawn } = require('child_process');
 
 const isWindows = process.platform === 'win32';
 
-/** Run a command, return { ok, stdout, stderr, status }. Never throws. */
+/** Run a command synchronously, return { ok, stdout, stderr, status }. Never throws. */
 function run(cmd, args, opts = {}) {
   const r = spawnSync(cmd, args, { encoding: 'utf8', ...opts });
   return {
@@ -28,6 +28,31 @@ function run(cmd, args, opts = {}) {
   };
 }
 
+/**
+ * Run a command asynchronously — keeps the event loop alive so spinners can animate.
+ * Returns a Promise<{ ok, stdout, stderr, status }>. Never rejects.
+ */
+function runAsync(cmd, args, opts = {}) {
+  return new Promise((resolve) => {
+    const child = spawn(cmd, args, { stdio: 'pipe', ...opts });
+    let stdout = '';
+    let stderr = '';
+    if (child.stdout) child.stdout.on('data', (d) => { stdout += d.toString(); });
+    if (child.stderr) child.stderr.on('data', (d) => { stderr += d.toString(); });
+    child.on('close', (code) => {
+      resolve({
+        ok: code === 0,
+        status: code,
+        stdout,
+        stderr
+      });
+    });
+    child.on('error', (err) => {
+      resolve({ ok: false, status: null, stdout, stderr: stderr || err.message });
+    });
+  });
+}
+
 /** Is a command available on PATH? */
 function hasCmd(name) {
   const probe = isWindows ? run('where', [name]) : run('which', [name]);
@@ -76,26 +101,37 @@ function pipInstall(skillsDir, requirementsPath, upgrade = false) {
   return run(venvPython(skillsDir), args).ok;
 }
 
-/** `npm install` (fresh) or `npm update` (existing) in a skill scripts dir. */
-function npmInstall(dir, upgrade = false) {
+/** `npm install` (fresh) or `npm update` (existing) in a skill scripts dir. Async — keeps spinner alive. */
+async function npmInstall(dir, upgrade = false, extraEnv = {}) {
   const args = upgrade ? ['update', '--no-audit', '--no-fund'] : ['install', '--no-audit', '--no-fund'];
-  return run('npm', args, { cwd: dir }).ok;
+  const env = { ...process.env, ...extraEnv };
+  const r = await runAsync('npm', args, { cwd: dir, env });
+  return r.ok;
 }
 
 /**
  * Download the Puppeteer Chromium browser for chrome-devtools.
  * Prefer puppeteer's own install script (cache-aware, same as its postinstall);
- * fall back to the bundled @puppeteer/browsers CLI. `npx puppeteer ...` is
- * avoided — puppeteer ships no `puppeteer` bin under that invocation and `--yes`
- * would refetch from the registry.
+ * fall back to the bundled @puppeteer/browsers CLI.
+ *
+ * Non-interactive (default): async — keeps spinner alive during download.
+ * Interactive: sync with stdio inherit — native progress bar renders in TTY.
  */
-function installChromium(scriptsDir) {
+async function installChromium(scriptsDir, interactive = false) {
   // Absolute path so it resolves regardless of the child process cwd.
   const installMjs = path.resolve(scriptsDir, 'node_modules', 'puppeteer', 'install.mjs');
   if (fs.existsSync(installMjs)) {
-    return run('node', [installMjs], { cwd: scriptsDir }).ok;
+    if (interactive) {
+      return run('node', [installMjs], { cwd: scriptsDir, stdio: 'inherit' }).ok;
+    }
+    const r = await runAsync('node', [installMjs], { cwd: scriptsDir });
+    return r.ok;
+  }
+  if (interactive) {
+    return run('npx', ['--yes', '@puppeteer/browsers', 'install', 'chrome'], { cwd: scriptsDir, stdio: 'inherit' }).ok;
   }
-  return run('npx', ['--yes', '@puppeteer/browsers', 'install', 'chrome'], { cwd: scriptsDir }).ok;
+  const r = await runAsync('npx', ['--yes', '@puppeteer/browsers', 'install', 'chrome'], { cwd: scriptsDir });
+  return r.ok;
 }
 
 /** Does a skill scripts dir declare a given npm dependency? */
@@ -108,9 +144,59 @@ function pkgHasDep(scriptsDir, name) {
   }
 }
 
-/** Download the Playwright Chromium browser (for the pptx html2pptx workflow). */
-function installPlaywrightBrowser(scriptsDir) {
-  return run('npx', ['--yes', 'playwright', 'install', 'chromium'], { cwd: scriptsDir }).ok;
+/** Download the Playwright Chromium browser (for the pptx html2pptx workflow). Async — keeps spinner alive. */
+async function installPlaywrightBrowser(scriptsDir) {
+  const r = await runAsync('npx', ['--yes', 'playwright', 'install', 'chromium'], { cwd: scriptsDir });
+  return r.ok;
+}
+
+/**
+ * Detect system Chrome/Chromium installation (cross-platform).
+ * Returns the executable path if found, undefined otherwise.
+ * Supports macOS, Windows, Linux (including snap + PATH fallback).
+ */
+function detectSystemChrome() {
+  const candidates = (() => {
+    switch (process.platform) {
+      case 'darwin':
+        return [
+          '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+          '/Applications/Chromium.app/Contents/MacOS/Chromium',
+        ];
+      case 'win32': {
+        const pf = process.env.PROGRAMFILES;
+        const pf86 = process.env['PROGRAMFILES(X86)'];
+        const local = process.env.LOCALAPPDATA;
+        return [
+          pf && `${pf}\\Google\\Chrome\\Application\\chrome.exe`,
+          pf86 && `${pf86}\\Google\\Chrome\\Application\\chrome.exe`,
+          local && `${local}\\Google\\Chrome\\Application\\chrome.exe`,
+        ].filter(Boolean);
+      }
+      default: // Linux & others
+        return [
+          '/usr/bin/google-chrome-stable',
+          '/usr/bin/google-chrome',
+          '/usr/bin/chromium-browser',
+          '/usr/bin/chromium',
+          '/snap/bin/chromium',
+        ];
+    }
+  })();
+
+  for (const p of candidates) {
+    try { if (fs.existsSync(p)) return p; } catch { /* skip */ }
+  }
+
+  // Linux: last resort — check PATH
+  if (process.platform === 'linux') {
+    for (const cmd of ['google-chrome', 'google-chrome-stable', 'chromium-browser', 'chromium']) {
+      const r = run(isWindows ? 'where' : 'which', [cmd]);
+      if (r.ok && r.stdout.trim()) return r.stdout.trim();
+    }
+  }
+
+  return undefined;
 }
 
 /**
@@ -176,6 +262,7 @@ module.exports = {
   pipInstall,
   npmInstall,
   installChromium,
+  detectSystemChrome,
   collectRequirements,
   collectSkillPackages,
   pkgHasDep,

package/bin/phases/skills-setup.js

@@ -65,10 +65,21 @@ function setupPython(ctx, skillsDir) {
 }
 
 /** Run skill-local npm installs/upgrades + browser binaries for a platform's skills. */
-function setupNode(ctx, skillsDir) {
+async function setupNode(ctx, skillsDir) {
+  // Detect system Chrome before npm install — skip ~300MB Chromium download if found
+  const chromeScripts = path.join(skillsDir, 'chrome-devtools', 'scripts');
+  const hasChromePkg = fs.existsSync(path.join(chromeScripts, 'package.json'));
+  const systemChrome = hasChromePkg ? dep.detectSystemChrome() : null;
+
   for (const { skill, dir, hasNodeModules } of dep.collectSkillPackages(skillsDir)) {
     ctx.ui.startSpinner(ctx.t('npmInstalling', { skill }));
-    const ok = dep.npmInstall(dir, hasNodeModules); // upgrade if node_modules exists
+
+    // chrome-devtools: skip puppeteer postinstall Chromium download if system Chrome exists
+    const extraEnv = (skill === 'chrome-devtools' && systemChrome)
+      ? { PUPPETEER_SKIP_DOWNLOAD: 'true' }
+      : {};
+    const ok = await dep.npmInstall(dir, hasNodeModules, extraEnv);
+
     if (ok) {
       ctx.ui.stopSpinner(ctx.t('npmInstalled', { skill }));
     } else {
@@ -79,17 +90,21 @@ function setupNode(ctx, skillsDir) {
     // Skills using Playwright (e.g. pptx) also need a browser binary.
     if (dep.pkgHasDep(dir, 'playwright')) {
       ctx.ui.startSpinner(ctx.t('playwrightInstalling', { skill }));
-      const pw = dep.installPlaywrightBrowser(dir);
+      const pw = await dep.installPlaywrightBrowser(dir);
       ctx.ui.stopSpinner(pw ? ctx.t('playwrightReady', { skill }) : ctx.t('playwrightSkipped', { skill }));
     }
   }
 
-  // Chromium for chrome-devtools (puppeteer-based).
-  const chromeScripts = path.join(skillsDir, 'chrome-devtools', 'scripts');
-  if (fs.existsSync(path.join(chromeScripts, 'package.json'))) {
-    ctx.ui.startSpinner(ctx.t('chromiumInstalling'));
-    const ok = dep.installChromium(chromeScripts);
-    ctx.ui.stopSpinner(ok ? ctx.t('chromiumReady') : ctx.t('chromiumSkipped'));
+  // Chromium for chrome-devtools (puppeteer-based, ~300MB).
+  // Uses stdio:inherit for native progress bar when downloading (TTY-only).
+  if (hasChromePkg) {
+    if (systemChrome) {
+      ctx.ui.info(ctx.t('chromiumSystemChromeFound', { path: systemChrome }));
+    } else {
+      ctx.ui.info(ctx.t('chromiumInstalling'));
+      const ok = await dep.installChromium(chromeScripts, true);
+      ctx.ui.info(ok ? '✓ ' + ctx.t('chromiumReady') : ctx.t('chromiumSkipped'));
+    }
   }
 }
 
@@ -113,7 +128,7 @@ async function setupSkillDeps(ctx) {
 
   for (const key of ctx.platforms) {
     setupPython(ctx, PLATFORMS[key].skillsDir);
-    setupNode(ctx, PLATFORMS[key].skillsDir);
+    await setupNode(ctx, PLATFORMS[key].skillsDir);
   }
 
   guideManual(ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haposoft/cafekit",
-  "version": "0.11.7",
+  "version": "0.11.9",
   "description": "Claude Code-first spec-driven workflow for AI coding assistants. Bundles CafeKit hapo: skills, runtime hooks, agents, and installer scaffolding.",
   "author": "Haposoft <nghialt@haposoft.com>",
   "license": "MIT",

package/src/claude/skills/chrome-devtools/SKILL.md

@@ -191,6 +191,39 @@ node "$SKILL_DIR/navigate.js" --url https://example.com
 
 **Linux/WSL only**: Run `"$SKILL_DIR/install-deps.sh"` first for Chrome system libraries.
 
+## Chrome/Chromium Configuration
+
+By default, chrome-devtools bundles Chromium via puppeteer (~300MB download on first install). To use your existing Chrome installation instead:
+
+### Auto-Detection
+
+chrome-devtools auto-detects Chrome at standard OS paths and uses it automatically:
+
+| OS | Checked Paths |
+|----|---------------|
+| macOS | `/Applications/Google Chrome.app/...`, `/Applications/Chromium.app/...` |
+| Windows | `%PROGRAMFILES%\Google\Chrome\...`, `%PROGRAMFILES(X86)%\...`, `%LOCALAPPDATA%\...` |
+| Linux | `/usr/bin/google-chrome*`, `/usr/bin/chromium*`, `/snap/bin/chromium` |
+
+### Manual Configuration
+
+To force a specific Chrome installation, copy `.env.example` to `.env` and set `CHROME_EXECUTABLE_PATH`:
+
+```bash
+cp "$SKILL_DIR/.env.example" "$SKILL_DIR/.env"
+# Edit .env and set CHROME_EXECUTABLE_PATH to your Chrome executable
+```
+
+### Skip Chromium Download
+
+To skip the ~300MB download during `npm install` when Chrome is already available:
+
+```bash
+PUPPETEER_SKIP_DOWNLOAD=true npm install --prefix "$SKILL_DIR"
+```
+
+If no system Chrome is found, puppeteer's bundled Chromium is used as a fallback.
+
 ## Session Persistence
 
 Browser state persists across script executions via WebSocket endpoint file (`.browser-session.json`).

package/src/claude/skills/chrome-devtools/scripts/.env.example

@@ -0,0 +1,20 @@
+# Chrome/Chromium Configuration
+# ============================================================================
+
+# Custom Chrome/Chromium executable path (optional)
+# chrome-devtools auto-detects system Chrome at standard OS paths.
+# Set this only if Chrome is installed in a non-standard location.
+#
+# macOS:
+# CHROME_EXECUTABLE_PATH=/Applications/Google Chrome.app/Contents/MacOS/Google Chrome
+#
+# Windows:
+# CHROME_EXECUTABLE_PATH=C:\Program Files\Google\Chrome\Application\chrome.exe
+#
+# Linux:
+# CHROME_EXECUTABLE_PATH=/usr/bin/google-chrome
+
+# Skip puppeteer's Chromium download during npm install (optional)
+# Set to true if you already have Chrome/Chromium installed and want to skip
+# the ~300MB Chromium download during `npm install`.
+# PUPPETEER_SKIP_DOWNLOAD=true

package/src/claude/skills/chrome-devtools/scripts/lib/browser.js

@@ -48,6 +48,63 @@ export function resolveHeadless(value) {
   return false;
 }
 
+/**
+ * Resolve Chrome/Chromium executable path.
+ * Fallback chain: CHROME_EXECUTABLE_PATH → PUPPETEER_EXECUTABLE_PATH →
+ * OS auto-detect → undefined (puppeteer bundled Chromium).
+ * @returns {string|undefined}
+ */
+export function resolveExecutablePath() {
+  // 1. Env-var overrides (CafeKit + Puppeteer conventions)
+  for (const key of ['CHROME_EXECUTABLE_PATH', 'PUPPETEER_EXECUTABLE_PATH']) {
+    const p = process.env[key];
+    if (!p) continue;
+    try {
+      if (fs.existsSync(p)) { log(`Chrome (${key}): ${p}`); return p; }
+      log(`${key} set but not found: ${p}`);
+    } catch { /* permission error — skip */ }
+  }
+
+  // 2. OS auto-detection
+  const candidates = (() => {
+    switch (process.platform) {
+      case 'darwin':
+        return [
+          '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+          '/Applications/Chromium.app/Contents/MacOS/Chromium',
+        ];
+      case 'win32': {
+        const pf = process.env.PROGRAMFILES;
+        const pf86 = process.env['PROGRAMFILES(X86)'];
+        const local = process.env.LOCALAPPDATA;
+        return [
+          pf && `${pf}\\Google\\Chrome\\Application\\chrome.exe`,
+          pf86 && `${pf86}\\Google\\Chrome\\Application\\chrome.exe`,
+          local && `${local}\\Google\\Chrome\\Application\\chrome.exe`,
+        ].filter(Boolean);
+      }
+      default: // Linux & others
+        return [
+          '/usr/bin/google-chrome-stable',
+          '/usr/bin/google-chrome',
+          '/usr/bin/chromium-browser',
+          '/usr/bin/chromium',
+          '/snap/bin/chromium',
+        ];
+    }
+  })();
+
+  for (const p of candidates) {
+    try {
+      if (fs.existsSync(p)) { log(`Chrome auto-detected: ${p}`); return p; }
+    } catch { /* skip */ }
+  }
+
+  // 3. Bundled Chromium fallback
+  log('No system Chrome found, using bundled Chromium');
+  return undefined;
+}
+
 /**
  * Get default Chrome profile path based on OS
  * @returns {string} - Path to Chrome's default user data directory
@@ -253,12 +310,16 @@ export async function getBrowser(options = {}) {
     log(`Using default Chrome profile: ${userDataDir}`);
   }
 
+  // Resolve Chrome executable — env var or OS auto-detect (fallback: bundled Chromium)
+  const executablePath = resolveExecutablePath();
+
   // Destructure known properties — only pass Puppeteer-valid options to launch()
   const { headless, args: extraArgs, viewport, useDefaultProfile, profile, browserUrl, wsEndpoint: _ws, userDataDir: _udd, ...restOptions } = options;
 
   // Launch new browser
   const launchOptions = {
     headless: resolveHeadless(headless),
+    ...(executablePath && { executablePath }),
     args: [
       '--no-sandbox',
       '--disable-setuid-sandbox',