@house365/comate 0.2.3 → 0.2.5

package/bin/init-run.mjs

@@ -3,10 +3,8 @@ import { existsSync, readFileSync } from 'node:fs';
 import { join, resolve } from 'node:path';
 
 import {
-  MIN_OPENSPEC,
   NPM_TIMEOUT_MS,
   SKILLS_TIMEOUT_MS,
-  capture,
   npmInvocation,
   openSpecState,
   run,
@@ -56,21 +54,26 @@ export async function init(pkgRoot) {
     return 1;
   }
 
-  console.log(`\nskills 装到 ${join(home, '.agents', 'skills')}（用户级，所有项目共用）`);
-  console.log(`openspec/ 建在 ${cwd}\n`);
+  // ponytail: a plain line, not a spinner. \r-erasing it needs a real terminal,
+  // and through npm's .ps1 shim stdout is a pipe where \r leaves the padding
+  // visible — the failed cleanup looked worse than just keeping the line.
+  console.log('\n安装中…');
 
   // 1. OpenSpec CLI — a PATH command, so always global.
   const os = openSpecState();
   if (os.status === 'ready') {
     results.push(['OpenSpec CLI', 'skipped', `已安装 ${os.version}`]);
   } else {
-    const label = os.status === 'outdated' ? `升级 (${os.version} < ${MIN_OPENSPEC})` : '安装';
-    console.log(`→ ${label} OpenSpec CLI (npm install -g)`);
-    const r = run(npmInvocation(['install', '-g', '@fission-ai/openspec@latest']), NPM_TIMEOUT_MS);
+    const r = run(
+      npmInvocation(['install', '-g', '@fission-ai/openspec@latest']),
+      NPM_TIMEOUT_MS,
+      { quiet: true },
+    );
     if (!r.ok) {
       // An outdated-but-usable CLI is better than a hard failure.
       const usable = os.status === 'outdated';
-      results.push(['OpenSpec CLI', usable ? 'skipped' : 'failed', usable ? `升级失败，沿用 ${os.version}` : r.reason]);
+      const note = usable ? `升级失败，沿用 ${os.version}` : r.reason;
+      results.push(['OpenSpec CLI', usable ? 'skipped' : 'failed', note, usable ? '' : r.output]);
     } else if (openSpecState().status === 'missing') {
       results.push(['OpenSpec CLI', 'failed', 'npm 安装完成但 PATH 中仍找不到 openspec，请重启终端']);
     } else {
@@ -83,7 +86,6 @@ export async function init(pkgRoot) {
   if (superpowersInstalled('global') || superpowersInstalled('project')) {
     results.push(['Superpowers', 'skipped', '已安装']);
   } else {
-    console.log('\n→ 安装 Superpowers');
     const r = run(
       skillsInvocation(pkgRoot, ['add', 'obra/superpowers', '-g', '-y']),
       SKILLS_TIMEOUT_MS,
@@ -94,20 +96,19 @@ export async function init(pkgRoot) {
     const note = r.ok
       ? ''
       : `${r.reason} — 需要访问 github.com，检查网络/代理后重试`;
-    results.push(['Superpowers', r.ok ? 'installed' : 'failed', note]);
+    results.push(['Superpowers', r.ok ? 'installed' : 'failed', note, r.output]);
   }
 
   // 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', '*', '-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')}，重跑看详情`]);
+    results.push(['comate', 'failed', `未装到 ${join(home, '.agents', 'skills')}`]);
   } else {
-    results.push(['comate', r.ok ? 'installed' : 'failed', r.ok ? '' : r.reason]);
+    results.push(['comate', r.ok ? 'installed' : 'failed', r.ok ? '' : r.reason, r.output]);
   }
 
   // 4. openspec/ project structure. Not optional: comate's open and archive
@@ -116,7 +117,6 @@ export async function init(pkgRoot) {
   if (existsSync('openspec')) {
     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
@@ -129,27 +129,38 @@ export async function init(pkgRoot) {
         shell: process.platform === 'win32',
       },
       NPM_TIMEOUT_MS,
+      { quiet: true },
     );
-    results.push(['openspec 结构', r2.ok ? 'installed' : 'failed', r2.ok ? '' : r2.reason]);
+    results.push(['openspec 结构', r2.ok ? 'installed' : 'failed', r2.ok ? '' : r2.reason, r2.output]);
   }
 
-  return report(results);
+  return report(results, { home, cwd });
 }
 
-function report(results) {
-  const mark = { installed: '✓', skipped: '·', failed: '✗' };
-  console.log('');
-  for (const [name, status, note] of results) {
-    console.log(`  ${mark[status]} ${name.padEnd(14)}${note}`);
-  }
-
+// Success is one screen: the wordmark and where things landed. The per-item
+// breakdown only earns its space when something failed, and then it carries the
+// reason — a bare "失败" would leave the user with nowhere to go.
+function report(results, { home, cwd }) {
   const failed = results.filter(([, s]) => s === 'failed');
   if (failed.length > 0) {
-    console.error(`\n${failed.length} 项失败，修好后重跑 comate init。`);
+    console.error('\n安装失败\n');
+    for (const [name, status, note, output] of results) {
+      const mark = { installed: '✓', skipped: '·', failed: '✗' }[status];
+      console.error(`  ${mark} ${name.padEnd(14)}${note}`);
+      // The child's own output, indented under the item it belongs to, so a
+      // knock-on failure doesn't look like a second unrelated problem.
+      if (status === 'failed' && output) {
+        for (const line of output.split('\n')) console.error(`      ${line.trim()}`);
+      }
+    }
+    console.error('\n修好后重跑 comate init。');
     return 1;
   }
+
   console.log(banner(pkgVersion()));
-  console.log('在 agent 中输入 /comate 开始使用，或跑 comate doctor 自检。\n');
+  console.log(`  skills      ${join(home, '.agents', 'skills')}`);
+  console.log(`  openspec    ${join(cwd, 'openspec')}`);
+  console.log('\n  输入 /comate 开始使用，comate doctor 可自检\n');
   return 0;
 }
 
@@ -163,20 +174,21 @@ export function pkgVersion(root = resolve(import.meta.dirname, '..')) {
   }
 }
 
-// Box-drawing glyphs need a UTF-8 capable terminal. Windows consoles still
-// default to a legacy codepage where they render as mojibake, so the wordmark
-// only goes out when the codepage says otherwise; everything else gets the
-// plain line.
+// Only CI gates the wordmark. Two earlier guards were both wrong and are worth
+// naming so they don't come back:
 //
-// isTTY deliberately does NOT gate this. npm's Windows global install resolves
-// `comate` to a comate.ps1 shim, and PowerShell calling node through a .ps1
-// wrapper takes over stdout — so isTTY is false in a real terminal and the
-// wordmark never showed. CI is the case actually worth suppressing, and it
-// announces itself with an env var.
-export function banner(version, { utf8 = unicodeSafe(), ci = isCI() } = {}) {
+//   isTTY — npm's Windows global install resolves `comate` to a comate.ps1
+//   shim, and PowerShell calling node through a .ps1 wrapper takes over stdout,
+//   so isTTY is false in a real terminal — exactly where the logo belongs.
+//
+//   chcp — reports the codepage the child process inherited, which the shim
+//   does not propagate (65001 outside, 936 inside). It also answers the wrong
+//   question: writing to a real Windows console goes through WriteConsoleW,
+//   which converts to UTF-16 and bypasses the codepage entirely.
+export function banner(version, { ci = isCI() } = {}) {
   const tag = `comate${version ? ` v${version}` : ''}`;
   const plain = `\n  ${tag} - AI coding almost there!\n`;
-  if (!utf8 || ci) return plain;
+  if (ci) return plain;
 
   const art = [
     ' ██████╗ ██████╗ ███╗   ███╗ █████╗ ████████╗███████╗',
@@ -199,14 +211,6 @@ export function banner(version, { utf8 = unicodeSafe(), ci = isCI() } = {}) {
   ].join('\n');
 }
 
-// POSIX terminals are UTF-8 in practice. Windows consoles are not: the legacy
-// codepage (936, 437, …) renders box-drawing glyphs as mojibake, so ask chcp
-// and only claim UTF-8 on 65001.
-function unicodeSafe() {
-  if (process.platform !== 'win32') return true;
-  return /65001/.test(capture('chcp', []) ?? '');
-}
-
 // Every major CI sets CI=true; GITHUB_ACTIONS covers the Actions runner even in
 // the odd config that doesn't.
 function isCI() {

package/bin/init.mjs

@@ -89,9 +89,11 @@ function run({ command, args, shell }, timeout, { quiet = false } = {}) {
   });
   if (error) return { ok: false, reason: error.message };
   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)}` };
+    // Hand the buffered output back rather than printing it here: the caller
+    // knows whether this failure is the root cause or a knock-on effect, and
+    // printing both would bury the one line that matters.
+    const out = quiet ? ((stdout ?? '') + (stderr ?? '')).trim() : '';
+    return { ok: false, reason: `exit code ${String(status)}`, output: out };
   }
   return { ok: true };
 }

package/package.json

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