@haposoft/cafekit 0.15.1 → 0.15.3

package/README.md

@@ -2,7 +2,7 @@
 
 > Native spec-driven workflow and runtime bundle for Claude Code, Codex CLI, and OpenCode.
 
-[![Version](https://img.shields.io/badge/version-0.15.1-blue.svg)](https://github.com/haposoft/cafekit)
+[![Version](https://img.shields.io/badge/version-0.15.3-blue.svg)](https://github.com/haposoft/cafekit)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](LICENSE)
 [![Claude%20Code](https://img.shields.io/badge/Claude%20Code-Native-orange.svg)](https://claude.ai/code)
 [![Codex%20CLI](https://img.shields.io/badge/Codex%20CLI-Native-111111.svg)](https://developers.openai.com/codex)
@@ -134,6 +134,8 @@ AGENTS.md
 CafeKit owns only its marked block in root `AGENTS.md`. Codex discovers skills
 and custom agents natively after the repository is trusted; no project
 `config.toml` is generated. Review and trust project hooks with `/hooks`.
+On Windows, installed hook commands are bound to the canonical project path
+without requiring Git and remain stable when a session starts in a subdirectory.
 CafeKit uses Codex's native status and usage UI instead of installing the
 Claude statusline.
 

package/bin/__tests__/codex-native.test.js

@@ -18,6 +18,7 @@ const {
   resolvePlatforms,
   selectLanguage
 } = require('../phases/select-platform');
+const { MESSAGES } = require('../lib/i18n');
 
 const PACKAGE_ROOT = path.join(__dirname, '../..');
 const PACKAGE_VERSION = JSON.parse(
@@ -59,6 +60,12 @@ function allFiles(root, predicate) {
   return found;
 }
 
+function allHookHandlers(config) {
+  return Object.values(config.hooks).flatMap((groups) => (
+    groups.flatMap((group) => group.hooks)
+  ));
+}
+
 function parseGeneratedTomlString(content, key) {
   const match = content.match(new RegExp(`^${key} = (.+)$`, 'm'));
   assert.ok(match, `missing TOML key: ${key}`);
@@ -196,6 +203,114 @@ test('same-version install can add Codex beside an existing runtime', async () =
   }
 });
 
+test('resolvePlatforms interactive prompts to add more platforms when prior install exists', async () => {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), 'cafekit-add-platforms-'));
+  const originalCwd = process.cwd();
+  try {
+    fs.mkdirSync(path.join(root, '.claude'), { recursive: true });
+    fs.writeFileSync(
+      path.join(root, '.claude', 'cafekit.json'),
+      `${JSON.stringify({ version: PACKAGE_VERSION, platform: 'claude' })}\n`
+    );
+    process.chdir(root);
+    const ctx = {
+      options: { platforms: [], forceOverwrite: false },
+      interactive: true,
+      dryRun: false,
+      ui: {
+        info() {},
+        confirm: async ({ message }) => {
+          if (message.includes('Existing platforms') || message.includes('addPlatformsPrompt')) return true;
+          if (message.includes('confirmAllDetected') || message.includes('existing configs')) return true;
+          return true;
+        },
+        select: async ({ message, options }) => {
+          if (message.includes('selectPlatform') || message.includes('Select platform')) {
+            return ['codex'];
+          }
+          return options[0].value;
+        },
+        isCancel: () => false
+      },
+      t: (key, vars) => {
+        const tpl = (MESSAGES.en && MESSAGES.en[key]) || key;
+        if (vars) return tpl.replace(/\{(\w+)\}/g, (_, name) => (vars[name] !== undefined ? String(vars[name]) : `{${name}}`));
+        return tpl;
+      }
+    };
+    await resolvePlatforms(ctx);
+    assert.deepEqual(ctx.platforms.sort(), ['claude', 'codex'].sort());
+  } finally {
+    process.chdir(originalCwd);
+    fs.rmSync(root, { recursive: true, force: true });
+  }
+});
+
+test('resolvePlatforms interactive keeps existing platforms when user declines to add more', async () => {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), 'cafekit-keep-platforms-'));
+  const originalCwd = process.cwd();
+  try {
+    fs.mkdirSync(path.join(root, '.claude'), { recursive: true });
+    fs.writeFileSync(
+      path.join(root, '.claude', 'cafekit.json'),
+      `${JSON.stringify({ version: PACKAGE_VERSION, platform: 'claude' })}\n`
+    );
+    process.chdir(root);
+    const ctx = {
+      options: { platforms: [], forceOverwrite: false },
+      interactive: true,
+      dryRun: false,
+      ui: {
+        info() {},
+        confirm: async ({ message }) => {
+          // Check that the message is properly rendered without {names} placeholder
+          // If i18n uses {existing} but ctx passes {names}, the rendered message will contain {existing}
+          if (message.includes('Existing platforms') || message.includes('既存プラットフォーム') || message.includes('Nền tảng hiện có')) {
+            assert.ok(!message.includes('{'), `Message should not contain unrendered placeholder: ${message}`);
+            assert.ok(!message.includes('}'), `Message should not contain unrendered placeholder: ${message}`);
+            return false; // decline to add more
+          }
+          return true; // confirmAllDetected
+        },
+        select: async () => ['claude'],
+        isCancel: () => false
+      },
+      t: (key, vars) => {
+        const tpl = (MESSAGES.en && MESSAGES.en[key]) || key;
+        if (vars) return tpl.replace(/\{(\w+)\}/g, (_, name) => (vars[name] !== undefined ? String(vars[name]) : `{${name}}`));
+        return tpl;
+      }
+    };
+    await resolvePlatforms(ctx);
+    assert.deepEqual(ctx.platforms, ['claude']);
+  } finally {
+    process.chdir(originalCwd);
+    fs.rmSync(root, { recursive: true, force: true });
+  }
+});
+
+test('addPlatformsPrompt placeholder consistency across all locales', () => {
+  const expectedPlaceholders = ['names'];
+  const placeholderRegex = /\{(\w+)\}/g;
+
+  for (const [locale, messages] of Object.entries(MESSAGES)) {
+    const template = messages.addPlatformsPrompt;
+    assert.ok(template, `Missing addPlatformsPrompt key in locale: ${locale}`);
+
+    const placeholders = [];
+    let match;
+    while ((match = placeholderRegex.exec(template)) !== null) {
+      placeholders.push(match[1]);
+    }
+
+    assert.deepEqual(
+      placeholders,
+      expectedPlaceholders,
+      `Locale ${locale} addPlatformsPrompt has incorrect placeholders. Template: "${template}". Expected: ${JSON.stringify(expectedPlaceholders)}, Got: ${JSON.stringify(placeholders)}`
+    );
+  }
+});
+
 test('same-version non-interactive install performs a selective refresh', async () => {
   const root = fs.mkdtempSync(path.join(os.tmpdir(), 'cafekit-codex-version-'));
   const originalCwd = process.cwd();
@@ -316,6 +431,64 @@ test('Codex dry-run leaves both managed roots untouched', () => {
   });
 });
 
+test('Codex Windows hook launchers stay project-bound without Git from nested cwd', () => {
+  inTempProject((root) => {
+    const projectRoot = path.join(root, 'project with spaces');
+    fs.mkdirSync(projectRoot, { recursive: true });
+    const installed = install(projectRoot);
+    assert.equal(installed.status, 0, `${installed.stdout}\n${installed.stderr}`);
+
+    const config = JSON.parse(
+      fs.readFileSync(path.join(projectRoot, '.codex', 'hooks.json'), 'utf8')
+    );
+    const handlers = allHookHandlers(config);
+    assert.equal(handlers.length, 14);
+    for (const handler of handlers) {
+      assert.doesNotMatch(handler.commandWindows, /\$\(/);
+      assert.doesNotMatch(handler.commandWindows, /\bgit\b/i);
+      assert.doesNotMatch(handler.commandWindows, /process\.cwd\(\)|existsSync/);
+      const encodedPath = handler.commandWindows.match(/\s([A-Za-z0-9_-]+)$/)?.[1];
+      assert.ok(encodedPath, `missing encoded hook path in: ${handler.commandWindows}`);
+      const target = Buffer.from(encodedPath, 'base64url').toString('utf8');
+      assert.equal(path.dirname(target), fs.realpathSync(path.join(projectRoot, '.codex', 'hooks')));
+      assert.equal(
+        fs.existsSync(target),
+        true,
+        `missing installed hook: ${path.basename(target)}`
+      );
+    }
+
+    const nested = path.join(projectRoot, 'nested', 'workspace');
+    fs.mkdirSync(nested, { recursive: true });
+    const shadowHooks = path.join(projectRoot, 'nested', '.codex', 'hooks');
+    const shadowMarker = path.join(root, 'shadow-hook-ran');
+    fs.mkdirSync(shadowHooks, { recursive: true });
+    fs.writeFileSync(
+      path.join(shadowHooks, 'session.cjs'),
+      `require('node:fs').writeFileSync(${JSON.stringify(shadowMarker)}, 'unsafe')\n`
+    );
+    const session = config.hooks.SessionStart[0].hooks[0];
+    const nodeCommand = session.commandWindows.replace(/^node /, `"${process.execPath}" `);
+    const noGitEnv = { ...process.env, PATH: '' };
+    const launched = spawnSync(nodeCommand, {
+      cwd: nested,
+      encoding: 'utf8',
+      input: JSON.stringify({
+        session_id: 'windows-launcher-test',
+        cwd: nested,
+        hook_event_name: 'SessionStart',
+        source: 'startup'
+      }),
+      env: noGitEnv,
+      shell: true
+    });
+    assert.equal(launched.status, 0, launched.stderr);
+    assert.match(launched.stdout, /Session startup\./);
+    assert.match(launched.stdout, /CafeKit project root:/);
+    assert.equal(fs.existsSync(shadowMarker), false);
+  });
+});
+
 test('Codex install is project-local, native, and upgrade-safe', () => {
   inTempProject((root) => {
     const userInstructions = '# User rules\n\nKeep this exact.\n';
@@ -456,3 +629,58 @@ test('Codex install is project-local, native, and upgrade-safe', () => {
     assert.doesNotMatch(fs.readFileSync(questionSkill, 'utf8'), /USER-CODEX-SENTINEL/);
   });
 });
+
+test('Codex install on top of existing Claude installation preserves content and adds Codex', () => {
+  inTempProject((root) => {
+    // Setup existing Claude installation with content
+    fs.mkdirSync(path.join(root, '.claude'), { recursive: true });
+    fs.writeFileSync(
+      path.join(root, '.claude', 'cafekit.json'),
+      `${JSON.stringify({ version: PACKAGE_VERSION, platform: 'claude' })}\n`
+    );
+
+    // Existing CLAUDE.md with content
+    const claudeMdContent = '# CLAUDE.md\n\n## User Instructions\n\nThis is my existing CLAUDE.md content.\n';
+    fs.writeFileSync(path.join(root, 'CLAUDE.md'), claudeMdContent);
+
+    // Existing AGENTS.md with content
+    const agentsMdContent = '# AGENTS.md\n\n## User Rules\n\nKeep this exact.\n';
+    fs.writeFileSync(path.join(root, 'AGENTS.md'), agentsMdContent);
+
+    // Run Codex install
+    const result = install(root, ['--platform', 'codex']);
+    assert.equal(result.status, 0, `${result.stdout}\n${result.stderr}`);
+
+    // Assert .claude/ and its content still exist
+    assert.equal(fs.existsSync(path.join(root, '.claude')), true, '.claude should exist');
+    assert.equal(fs.existsSync(path.join(root, '.claude', 'cafekit.json')), true, '.claude/cafekit.json should exist');
+    const claudeMetadata = JSON.parse(fs.readFileSync(path.join(root, '.claude', 'cafekit.json'), 'utf8'));
+    assert.equal(claudeMetadata.platform, 'claude', '.claude/cafekit.json should still be claude platform');
+
+    // Assert .codex/ is created with payload
+    assert.equal(fs.existsSync(path.join(root, '.codex')), true, '.codex should be created');
+    assert.equal(fs.existsSync(path.join(root, '.codex', 'hooks.json')), true, '.codex/hooks.json should exist');
+    assert.equal(fs.existsSync(path.join(root, '.codex', 'runtime.json')), true, '.codex/runtime.json should exist');
+    assert.equal(fs.existsSync(path.join(root, '.codex', 'hooks', 'privacy-block.cjs')), true, '.codex/hooks/privacy-block.cjs should exist');
+    assert.equal(fs.existsSync(path.join(root, '.codex', 'rules', 'workflow.md')), true, '.codex/rules/workflow.md should exist');
+    assert.equal(fs.existsSync(path.join(root, '.codex', 'scripts', 'validate-spec-output.cjs')), true, '.codex/scripts/validate-spec-output.cjs should exist');
+    assert.equal(fs.existsSync(path.join(root, '.agents', '.gitignore')), true, '.agents/.gitignore should exist');
+    assert.equal(fs.existsSync(path.join(root, '.agents', 'skills', 'specs', 'SKILL.md')), true, '.agents/skills/specs/SKILL.md should exist');
+
+    // Assert .codex/cafekit.json has platform codex
+    const codexMetadata = JSON.parse(fs.readFileSync(path.join(root, '.codex', 'cafekit.json'), 'utf8'));
+    assert.equal(codexMetadata.platform, 'codex', '.codex/cafekit.json should have platform codex');
+    assert.equal(codexMetadata.version, PACKAGE_VERSION, '.codex/cafekit.json should have current version');
+
+    // Assert AGENTS.md root contains CODEX markers AND preserves original content
+    const agentsMd = fs.readFileSync(path.join(root, 'AGENTS.md'), 'utf8');
+    assert.match(agentsMd, /<!-- CAFEKIT CODEX START -->/, 'AGENTS.md should have CODEX START marker');
+    assert.match(agentsMd, /<!-- CAFEKIT CODEX END -->/, 'AGENTS.md should have CODEX END marker');
+    assert.match(agentsMd, /Keep this exact\./, 'AGENTS.md should preserve original user content');
+    assert.ok(agentsMd.startsWith(agentsMdContent), 'AGENTS.md should start with original user content');
+
+    // Assert CLAUDE.md is unchanged
+    const claudeMd = fs.readFileSync(path.join(root, 'CLAUDE.md'), 'utf8');
+    assert.equal(claudeMd, claudeMdContent, 'CLAUDE.md should be unchanged');
+  });
+});

package/bin/__tests__/installer-safety.test.js

@@ -11,6 +11,10 @@ const {
   copyOpenCodeAgentsMdFile,
   normalizeOpenCodeBody
 } = require('../lib/opencode-install');
+const {
+  commandFailureReason,
+  resolvePackageCommand
+} = require('../lib/skill-deps');
 const { copyClaudeMdFile } = require('../phases/claude-runtime');
 const { configureAddressing, patchRuntimeLocale } = require('../phases/post-install');
 
@@ -18,6 +22,45 @@ const START = '<!-- CAFEKIT CLAUDE START -->';
 const END = '<!-- CAFEKIT CLAUDE END -->';
 const TEMPLATE = fs.readFileSync(path.join(__dirname, '../../src/claude/CLAUDE.md'), 'utf8');
 
+test('skill dependency package commands use cmd.exe for Windows npm launchers', () => {
+  const windows = resolvePackageCommand(
+    'npm',
+    ['install', '--no-audit', '--no-fund'],
+    'win32',
+    { ComSpec: 'C:\\Windows\\System32\\cmd.exe' }
+  );
+  assert.deepEqual(windows, {
+    command: 'C:\\Windows\\System32\\cmd.exe',
+    args: ['/d', '/s', '/c', 'npm.cmd', 'install', '--no-audit', '--no-fund']
+  });
+
+  const posix = resolvePackageCommand('npx', ['playwright', '--version'], 'linux', {});
+  assert.deepEqual(posix, {
+    command: 'npx',
+    args: ['playwright', '--version']
+  });
+});
+
+test('skill dependency failures surface the useful npm or spawn error code', () => {
+  assert.equal(
+    commandFailureReason({
+      stderr: "npm error Request failed\nnpm error code ENOTCACHED\nnpm error Log unavailable\n",
+      stdout: '',
+      status: 1
+    }),
+    'npm error code ENOTCACHED'
+  );
+  assert.equal(
+    commandFailureReason({
+      stderr: 'spawn npm.cmd EINVAL',
+      stdout: '',
+      status: null,
+      errorCode: 'EINVAL'
+    }),
+    'spawn npm.cmd EINVAL'
+  );
+});
+
 function inTempProject(run) {
   const originalCwd = process.cwd();
   const root = fs.mkdtempSync(path.join(os.tmpdir(), 'cafekit-installer-safety-'));

package/bin/lib/i18n.js

@@ -79,7 +79,7 @@ const MESSAGES = {
     pipFailed:             '{skill} — some packages failed. Retry:\n  {cmd}',
     npmInstalling:         'Installing Node packages: {skill}',
     npmInstalled:          '{skill} — Node packages ready',
-    npmFailed:             '{skill} — npm install failed. Check the log and retry in: {dir}',
+    npmFailed:             '{skill} — npm install failed ({error}). Retry in: {dir}',
     playwrightInstalling:  'Downloading Playwright browser for {skill}',
     playwrightReady:       '{skill} — Playwright browser ready',
     playwrightSkipped:     '{skill} — Playwright browser download skipped',
@@ -132,6 +132,9 @@ const MESSAGES = {
     langKept:             'Language: {lang} (saved — skipping prompt)',
     platformKept:         'Platform: {names} (saved — skipping prompt)',
 
+    // Add more platforms prompt (interactive, prior install exists)
+    addPlatformsPrompt:   'Existing platforms: {names}. Add more?',
+
     // Version picker
     versionPickPrompt:    'Select CafeKit version to install:',
     versionPickCurrent:   '(installed)',
@@ -199,7 +202,7 @@ const MESSAGES = {
     pipFailed:             '{skill} — 一部のパッケージが失敗しました。再試行:\n  {cmd}',
     npmInstalling:         'Node パッケージをインストール中: {skill}',
     npmInstalled:          '{skill} — Node パッケージの準備ができました',
-    npmFailed:             '{skill} — npm install に失敗しました。{dir} で手動再試行してください。',
+    npmFailed:             '{skill} — npm install に失敗しました ({error})。{dir} で手動再試行してください。',
     playwrightInstalling:  '{skill} 用の Playwright ブラウザをダウンロード中',
     playwrightReady:       '{skill} — Playwright ブラウザの準備ができました',
     playwrightSkipped:     '{skill} — Playwright ブラウザのダウンロードをスキップしました',
@@ -249,6 +252,9 @@ const MESSAGES = {
     langKept:             '言語: {lang} (保存済み — スキップ)',
     platformKept:         'プラットフォーム: {names} (保存済み — スキップ)',
 
+    // Add more platforms prompt (interactive, prior install exists)
+    addPlatformsPrompt:   '既存プラットフォーム: {names}。さらに追加しますか？',
+
     // Version picker
     versionPickPrompt:    'インストールする CafeKit バージョンを選択:',
     versionPickCurrent:   '(インストール済み)',
@@ -316,7 +322,7 @@ const MESSAGES = {
     pipFailed:             '{skill} — một số gói cài thất bại. Chạy lại thủ công:\n  {cmd}',
     npmInstalling:         'Đang cài gói Node: {skill}',
     npmInstalled:          '{skill} — gói Node đã sẵn sàng',
-    npmFailed:             '{skill} — npm install thất bại. Hãy thử lại trong: {dir}',
+    npmFailed:             '{skill} — npm install thất bại ({error}). Hãy thử lại trong: {dir}',
     playwrightInstalling:  'Đang tải Playwright browser cho {skill}',
     playwrightReady:       '{skill} — Playwright browser đã sẵn sàng',
     playwrightSkipped:     '{skill} — đã bỏ qua tải Playwright browser',
@@ -366,6 +372,9 @@ const MESSAGES = {
     langKept:             'Ngôn ngữ: {lang} (đã lưu — bỏ qua chọn lại)',
     platformKept:         'Nền tảng: {names} (đã lưu — bỏ qua chọn lại)',
 
+    // Add more platforms prompt (interactive, prior install exists)
+    addPlatformsPrompt:   'Nền tảng hiện có: {names}. Thêm nền tảng khác?',
+
     // Version picker
     versionPickPrompt:    'Chọn phiên bản CafeKit để cài:',
     versionPickCurrent:   '(đang cài)',

package/bin/lib/skill-deps.js

@@ -17,6 +17,19 @@ const { spawnSync, spawn } = require('child_process');
 
 const isWindows = process.platform === 'win32';
 
+/**
+ * npm and npx are `.cmd` launchers on Windows, so Node cannot spawn them
+ * directly without a command interpreter. Keep the shell boundary explicit;
+ * all arguments passed here are installer-owned constants.
+ */
+function resolvePackageCommand(command, args, platform = process.platform, env = process.env) {
+  if (platform !== 'win32') return { command, args };
+  return {
+    command: env.ComSpec || env.COMSPEC || 'cmd.exe',
+    args: ['/d', '/s', '/c', `${command}.cmd`, ...args]
+  };
+}
+
 /** Run a command synchronously, return { ok, stdout, stderr, status }. Never throws. */
 function run(cmd, args, opts = {}) {
   const r = spawnSync(cmd, args, { encoding: 'utf8', ...opts });
@@ -48,11 +61,32 @@ function runAsync(cmd, args, opts = {}) {
       });
     });
     child.on('error', (err) => {
-      resolve({ ok: false, status: null, stdout, stderr: stderr || err.message });
+      resolve({
+        ok: false,
+        status: null,
+        stdout,
+        stderr: stderr || err.message,
+        errorCode: err.code || ''
+      });
     });
   });
 }
 
+/** Return one actionable line without flooding the installer UI with npm output. */
+function commandFailureReason(result) {
+  const lines = `${result.stderr || ''}\n${result.stdout || ''}`
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter(Boolean);
+  return lines.find((line) => (
+    /\bE[A-Z0-9_]{2,}\b/.test(line) || /\bnpm error code\b/i.test(line)
+  ))
+    || lines.find((line) => /^npm error\b/i.test(line))
+    || lines.at(-1)
+    || result.errorCode
+    || `exit ${result.status ?? 'unknown'}`;
+}
+
 /** Is a command available on PATH? */
 function hasCmd(name) {
   const probe = isWindows ? run('where', [name]) : run('which', [name]);
@@ -104,12 +138,12 @@ async function pipInstall(skillsDir, requirementsPath, upgrade = false) {
   return r.ok;
 }
 
-/** `npm install` (fresh) or `npm update` (existing) in a skill scripts dir. Async — keeps spinner alive. */
+/** `npm install` (fresh) or `npm update` (existing) in a skill scripts dir. */
 async function npmInstall(dir, upgrade = false, extraEnv = {}) {
   const args = upgrade ? ['update', '--no-audit', '--no-fund'] : ['install', '--no-audit', '--no-fund'];
   const env = { ...process.env, ...extraEnv };
-  const r = await runAsync('npm', args, { cwd: dir, env });
-  return r.ok;
+  const npm = resolvePackageCommand('npm', args);
+  return runAsync(npm.command, npm.args, { cwd: dir, env });
 }
 
 /**
@@ -130,10 +164,11 @@ async function installChromium(scriptsDir, interactive = false) {
     const r = await runAsync('node', [installMjs], { cwd: scriptsDir });
     return r.ok;
   }
+  const npx = resolvePackageCommand('npx', ['--yes', '@puppeteer/browsers', 'install', 'chrome']);
   if (interactive) {
-    return run('npx', ['--yes', '@puppeteer/browsers', 'install', 'chrome'], { cwd: scriptsDir, stdio: 'inherit' }).ok;
+    return run(npx.command, npx.args, { cwd: scriptsDir, stdio: 'inherit' }).ok;
   }
-  const r = await runAsync('npx', ['--yes', '@puppeteer/browsers', 'install', 'chrome'], { cwd: scriptsDir });
+  const r = await runAsync(npx.command, npx.args, { cwd: scriptsDir });
   return r.ok;
 }
 
@@ -149,7 +184,8 @@ function pkgHasDep(scriptsDir, name) {
 
 /** 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 });
+  const npx = resolvePackageCommand('npx', ['--yes', 'playwright', 'install', 'chromium']);
+  const r = await runAsync(npx.command, npx.args, { cwd: scriptsDir });
   return r.ok;
 }
 
@@ -255,6 +291,8 @@ function systemHint(tool) {
 
 module.exports = {
   isWindows,
+  resolvePackageCommand,
+  commandFailureReason,
   hasCmd,
   findPython,
   venvDir,

package/bin/phases/codex-runtime.js

@@ -20,6 +20,33 @@ const CODEX_OWN_RUNTIME = [
   ['hooks.json', 'hooks.json']
 ];
 
+const WINDOWS_HOOK_COMMAND = /^node "\.codex\/hooks\/([a-z0-9-]+\.cjs)"$/;
+
+function materializeWindowsHookCommands(content, projectRoot = process.cwd()) {
+  const config = JSON.parse(content);
+  const canonicalRoot = fs.realpathSync(projectRoot);
+
+  for (const groups of Object.values(config.hooks || {})) {
+    for (const group of groups) {
+      for (const handler of group.hooks || []) {
+        if (typeof handler.commandWindows !== 'string') continue;
+        const match = handler.commandWindows.match(WINDOWS_HOOK_COMMAND);
+        if (!match) {
+          throw new Error(`Unsupported Codex Windows hook command: ${handler.commandWindows}`);
+        }
+        const hookPath = path.join(canonicalRoot, '.codex', 'hooks', match[1]);
+        const encodedPath = Buffer.from(hookPath, 'utf8').toString('base64url');
+        handler.commandWindows = (
+          'node -e "require(Buffer.from(process.argv[1],\'base64url\').toString(\'utf8\'))" ' +
+          encodedPath
+        );
+      }
+    }
+  }
+
+  return `${JSON.stringify(config, null, 2)}\n`;
+}
+
 function writeSourceFile(ctx, platformKey, src, dest, label, transform) {
   const platform = PLATFORMS[platformKey];
   const { action } = writeManagedFile({
@@ -41,7 +68,10 @@ function installRuntimeFiles(ctx, platformKey) {
       platformKey,
       path.join(CODEX_SRC, sourceRel),
       path.join(platform.folder, targetRel),
-      `Codex runtime: ${targetRel}`
+      `Codex runtime: ${targetRel}`,
+      sourceRel === 'hooks.json'
+        ? (content) => materializeWindowsHookCommands(content, process.cwd())
+        : undefined
     );
   }
   writeSourceFile(
@@ -107,4 +137,4 @@ function installCodexRuntime(ctx, platformKey) {
   return ctx;
 }
 
-module.exports = { installCodexRuntime };
+module.exports = { installCodexRuntime, materializeWindowsHookCommands };

package/bin/phases/select-platform.js

@@ -128,6 +128,19 @@ function cancelSelection(ctx) {
   return [];
 }
 
+async function promptAddMorePlatforms(ctx, savedPlatforms) {
+  const allKeys = getPlatformKeys();
+  const available = allKeys.filter((key) => !savedPlatforms.includes(key));
+  if (available.length === 0) return false;
+
+  const r = await ctx.ui.confirm(
+    { message: ctx.t('addPlatformsPrompt', { names: platformNames(savedPlatforms) }), initialValue: false },
+    false
+  );
+  if (ctx.ui.isCancel(r)) return false;
+  return r;
+}
+
 async function promptPlatforms(ctx) {
   const platforms = await promptPlatformSelection(ctx);
   return platforms.length > 0 ? platforms : cancelSelection(ctx);
@@ -164,6 +177,16 @@ async function resolvePlatforms(ctx) {
         platforms = await promptPlatforms(ctx);
         if (ctx.cancelled) return ctx;
       }
+    } else if (ctx.interactive) {
+      // No newly detected platforms, but user might want to ADD more platforms
+      const wantAdd = await promptAddMorePlatforms(ctx, savedPlatforms);
+      if (wantAdd) {
+        const added = await promptPlatformSelection(ctx);
+        if (ctx.cancelled) return ctx;
+        if (added.length > 0) {
+          platforms = [...new Set([...platforms, ...added])];
+        }
+      }
     }
     ctx.platforms = platforms;
     ctx.ui.info(ctx.t('platformKept', { names: platformNames(platforms) }));

package/bin/phases/skills-setup.js

@@ -79,12 +79,16 @@ async function setupNode(ctx, skillsDir) {
     const extraEnv = (skill === 'chrome-devtools' && systemChrome)
       ? { PUPPETEER_SKIP_DOWNLOAD: 'true' }
       : {};
-    const ok = await dep.npmInstall(dir, hasNodeModules, extraEnv);
+    const result = await dep.npmInstall(dir, hasNodeModules, extraEnv);
 
-    if (ok) {
+    if (result.ok) {
       ctx.ui.stopSpinner(ctx.t('npmInstalled', { skill }));
     } else {
-      ctx.ui.stopSpinner(ctx.t('npmFailed', { skill, dir }));
+      ctx.ui.stopSpinner(ctx.t('npmFailed', {
+        skill,
+        dir,
+        error: dep.commandFailureReason(result)
+      }));
       continue;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haposoft/cafekit",
-  "version": "0.15.1",
+  "version": "0.15.3",
   "description": "Native spec-driven workflows for Claude Code, Codex CLI, and OpenCode. Bundles CafeKit skills, runtime hooks, agents, and installer scaffolding.",
   "author": "Haposoft <nghialt@haposoft.com>",
   "license": "MIT",
@@ -49,7 +49,7 @@
     "@opencode-ai/plugin": "1.15.11"
   },
   "dependencies": {
-    "@clack/prompts": "^1.5.0",
+    "@clack/prompts": "0.11.0",
     "picocolors": "^1.1.1"
   }
 }