@house365/comate 0.1.4 → 0.2.1

package/README.md

@@ -37,9 +37,9 @@ comate init
 
 `init` 会装好 comate 及其依赖（OpenSpec CLI、Superpowers），并创建 `openspec/` 项目结构。支持 Claude Code、Codex、Cursor 等 70+ agent。可重复执行，已装的自动跳过。
 
-装完输入 `/comate` 开始使用，`comate doctor` 可自检。
+skills 装到用户级（`~/.agents/skills`），装一次所有项目共用；`openspec/` 是项目自己的规约，建在当前目录，所以 `init` 需要在项目目录下运行。
 
-想装到用户全局、所有项目共用，加 `-g`。
+装完输入 `/comate` 开始使用，`comate doctor` 可自检。
 
 ## 用法
 

package/bin/cli.mjs

@@ -25,7 +25,7 @@ if (args[0] === '--help' || args[0] === '-h') {
   console.log(`comate — OpenSpec + Superpowers 规约驱动的开发编排器
 
 用法:
-  comate init      在当前项目安装 comate、依赖和 openspec/ 结构
+  comate init      安装 comate 和依赖到用户级，并在当前项目创建 openspec/
   comate doctor    健康检查
 
 装好后在 agent 中输入 /comate 开始使用。`);

package/bin/doctor.mjs

@@ -4,10 +4,11 @@
 // installed copy so the user doesn't have to remember the path.
 import { spawnSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
-import { join } from 'node:path';
+import { delimiter, join, resolve } from 'node:path';
 
-// Where the skills CLI puts things. The project copy comes first so it wins
-// over a global one left from an earlier `comate -g` install.
+// Where the skills CLI puts things. `init` installs user-level, but a project
+// copy shadows it for the agent, so check cwd first and report on the same one
+// the agent would load.
 function skillRoots() {
   const home = process.env.HOME ?? process.env.USERPROFILE ?? '';
   const dirs = ['.agents/skills', '.claude/skills', '.cursor/skills', '.codex/skills'];
@@ -22,6 +23,26 @@ export function findComateScript(roots = skillRoots()) {
   return null;
 }
 
+// On Windows, bare `bash` usually resolves to System32\bash.exe — the WSL
+// launcher, which cannot open `D:\...` paths (it eats the backslashes and
+// reports "No such file or directory"). Find Git's bash instead, next to the
+// git.exe already on PATH, then the standard install dirs.
+export function findBash(env = process.env, exists = existsSync) {
+  if (process.platform !== 'win32') return 'bash';
+
+  const gitDirs = (env.PATH ?? env.Path ?? '').split(delimiter).filter(Boolean);
+  const candidates = [
+    // <git>/cmd/git.exe or <git>/mingw64/bin/git.exe -> <git>/bin/bash.exe
+    ...gitDirs.flatMap((d) =>
+      exists(join(d, 'git.exe')) ? [resolve(d, '..', 'bin', 'bash.exe'), resolve(d, '..', '..', 'bin', 'bash.exe')] : [],
+    ),
+    join(env.ProgramFiles ?? 'C:\\Program Files', 'Git', 'bin', 'bash.exe'),
+    join(env['ProgramFiles(x86)'] ?? 'C:\\Program Files (x86)', 'Git', 'bin', 'bash.exe'),
+    join(env.LOCALAPPDATA ?? '', 'Programs', 'Git', 'bin', 'bash.exe'),
+  ];
+  return candidates.find(exists) ?? null;
+}
+
 export function doctor(argv) {
   const script = findComateScript();
   if (!script) {
@@ -29,15 +50,21 @@ export function doctor(argv) {
     return 1;
   }
 
+  const bash = findBash();
+  if (!bash) {
+    console.error('找不到 bash — comate 的脚本需要 bash。请安装 Git for Windows。');
+    return 1;
+  }
+
   // comate.sh resolves sibling skills relative to the skills root, so run it
   // from there rather than from wherever the user happens to be.
   const skillsRoot = join(script, '..', '..', '..');
-  const { status, error } = spawnSync('bash', [script, 'doctor', ...argv], {
+  const { status, error } = spawnSync(bash, [script, 'doctor', ...argv], {
     cwd: skillsRoot,
     stdio: 'inherit',
   });
   if (error) {
-    console.error(`无法执行 bash — comate 的脚本需要 bash。${error.message}`);
+    console.error(`无法执行 bash (${bash}) — comate 的脚本需要 bash。${error.message}`);
     return 1;
   }
   return status ?? 1;

package/bin/init-run.mjs

@@ -13,12 +13,12 @@ import {
   superpowersInstalled,
 } from './init.mjs';
 
-// `comate init` initialises the current project — no flags. Global installs are
-// still reachable through the bare `comate -g` passthrough to the skills CLI.
+// `comate init` — no flags. Skills go user-level (~/.agents/skills), matching how
+// the CLI itself is installed (npm i -g): one copy, every project sees it.
 //
-// cwd is where the install lands, so refuse the two cases that are almost
-// certainly a mistake: the home directory, and a directory with no project
-// marker at all.
+// openspec/ is still per-project — it holds the project's own specs — so cwd
+// must be a project. Refuse the two cases that are almost certainly a mistake:
+// the home directory, and a directory with no project marker at all.
 const PROJECT_MARKERS = [
   '.git',
   'package.json',
@@ -55,10 +55,10 @@ export async function init(pkgRoot) {
     return 1;
   }
 
-  console.log(`\n安装到 ${join(cwd, '.agents', 'skills')}\n`);
+  console.log(`\nskills 装到 ${join(home, '.agents', 'skills')}（用户级，所有项目共用）`);
+  console.log(`openspec/ 建在 ${cwd}\n`);
 
-  // 1. OpenSpec CLI — invoked as a PATH command, so it installs globally even
-  // though the skills themselves go into this project.
+  // 1. OpenSpec CLI — a PATH command, so always global.
   const os = openSpecState();
   if (os.status === 'ready') {
     results.push(['OpenSpec CLI', 'skipped', `已安装 ${os.version}`]);
@@ -77,12 +77,17 @@ export async function init(pkgRoot) {
     }
   }
 
-  // 2. Superpowers — the skills CLI detects the agent itself.
-  if (superpowersInstalled('project')) {
+  // 2. Superpowers — the skills CLI detects the agent itself. A pre-existing
+  // project-level copy also counts: reinstalling globally would just shadow it.
+  if (superpowersInstalled('global') || superpowersInstalled('project')) {
     results.push(['Superpowers', 'skipped', '已安装']);
   } else {
-    console.log('\n→ 安装 Superpowers (skills add obra/superpowers)');
-    const r = run(skillsInvocation(pkgRoot, ['add', 'obra/superpowers', '-y']), SKILLS_TIMEOUT_MS);
+    console.log('\n→ 安装 Superpowers');
+    const r = run(
+      skillsInvocation(pkgRoot, ['add', 'obra/superpowers', '-g', '-y']),
+      SKILLS_TIMEOUT_MS,
+      { quiet: true },
+    );
     // It clones from GitHub, so a bare exit code hides the usual cause: no
     // network. Say so rather than leaving the user with "exit code 1".
     const note = r.ok
@@ -91,11 +96,18 @@ export async function init(pkgRoot) {
     results.push(['Superpowers', r.ok ? 'installed' : 'failed', note]);
   }
 
-  // 3. comate itself.
+  // 3. comate itself. The skills CLI reports per-agent failures without ever
+  // setting a non-zero exit code, and we swallow its output — so a zero status
+  // is not evidence the skill landed. Check the file.
   console.log('\n→ 安装 comate skills');
-  const comateArgs = ['add', pkgRoot, '--skill', '*', '-y'];
-  const r = run(skillsInvocation(pkgRoot, comateArgs), SKILLS_TIMEOUT_MS);
-  results.push(['comate', r.ok ? 'installed' : 'failed', r.ok ? '' : r.reason]);
+  const comateArgs = ['add', pkgRoot, '--skill', '*', '-g', '-y'];
+  const r = run(skillsInvocation(pkgRoot, comateArgs), SKILLS_TIMEOUT_MS, { quiet: true });
+  const landed = existsSync(join(home, '.agents', 'skills', 'comate', 'SKILL.md'));
+  if (r.ok && !landed) {
+    results.push(['comate', 'failed', `未装到 ${join(home, '.agents', 'skills')}，重跑看详情`]);
+  } else {
+    results.push(['comate', r.ok ? 'installed' : 'failed', r.ok ? '' : r.reason]);
+  }
 
   // 4. openspec/ project structure. Not optional: comate's open and archive
   // phases read it, so an install without it cannot actually run. An existing
@@ -104,8 +116,17 @@ export async function init(pkgRoot) {
     results.push(['openspec 结构', 'skipped', '已存在']);
   } else {
     console.log('\n→ 初始化 openspec/ 项目结构');
+    // --tools is not optional in practice: openspec derives the tool list by
+    // sniffing existing agent config dirs, so a fresh project (no .claude etc.)
+    // aborts with "No tools detected and no --tools flag provided". comate's
+    // skills are agent-agnostic and only openspec/ itself matters here, so ask
+    // for none rather than guessing which agents the user wants wired up.
     const r2 = run(
-      { command: 'openspec', args: ['init', '.'], shell: process.platform === 'win32' },
+      {
+        command: 'openspec',
+        args: ['init', '.', '--tools', 'none'],
+        shell: process.platform === 'win32',
+      },
       NPM_TIMEOUT_MS,
     );
     results.push(['openspec 结构', r2.ok ? 'installed' : 'failed', r2.ok ? '' : r2.reason]);

package/bin/init.mjs

@@ -75,14 +75,24 @@ function parsePackOutput(stdout) {
   throw new Error(`no usable file list in npm pack output:\n${stdout}`);
 }
 
-function run({ command, args, shell }, timeout) {
-  const { status, error } = spawnSync(command, args, {
-    stdio: 'inherit',
+// quiet buffers the child's output and prints it only on failure. The skills
+// CLI reports a per-agent failure for every agent that has no user-level skills
+// dir (PromptScript et al.) — cosmetic, since it neither affects the exit code
+// nor the agents that did get installed, but it reads like a broken install.
+// init prints its own summary, so on success the child's output adds nothing.
+function run({ command, args, shell }, timeout, { quiet = false } = {}) {
+  const { status, error, stdout, stderr } = spawnSync(command, args, {
+    stdio: quiet ? ['ignore', 'pipe', 'pipe'] : 'inherit',
+    encoding: quiet ? 'utf8' : undefined,
     timeout,
     ...(shell ? { shell: true } : {}),
   });
   if (error) return { ok: false, reason: error.message };
-  if (status !== 0) return { ok: false, reason: `exit code ${String(status)}` };
+  if (status !== 0) {
+    // Without this the user gets a bare "exit code 1" and no way to diagnose.
+    if (quiet) process.stderr.write((stdout ?? '') + (stderr ?? ''));
+    return { ok: false, reason: `exit code ${String(status)}` };
+  }
   return { ok: true };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@house365/comate",
-  "version": "0.1.4",
+  "version": "0.2.1",
   "description": "comate —— OpenSpec + Superpowers 规约驱动的 AI 开发编排器（Agent Skills）",
   "type": "module",
   "license": "MIT",