@jspg-ai/coding-bb 0.0.2-beta.28 → 0.0.2-beta.29

package/cbb/lib/install/init.js

@@ -23,6 +23,21 @@ const yaml = require('js-yaml');
 // 异步执行外部命令：长耗时 git 操作不阻塞事件循环，进度行才能持续刷新
 const execFileAsync = promisify(execFile);
 
+/**
+ * 跨平台异步执行命令（不阻塞事件循环）。
+ * Windows 上 npm / openspec 均为 .cmd：Node 直接 spawn .cmd 会报 EINVAL，
+ * `shell: true` 又会触发 DEP0190 弃用警告；故统一经 cmd.exe /d /s /c 执行。
+ * 仅用于本文件内常量命令（不接受用户输入拼接）。
+ */
+function execCmd(file, args, opts = {}) {
+  if (process.platform === 'win32') {
+    const line = [file, ...args].join(' ');
+    return execFileAsync(process.env.ComSpec || 'cmd.exe', ['/d', '/s', '/c', line],
+      { windowsHide: true, ...opts });
+  }
+  return execFileAsync(file, args, opts);
+}
+
 const SHARED_STANDARDS_DIR = path.join(__dirname, '..', '..', '..');
 
 // 目标项目根目录：默认取当前 cwd，init() / initWorkspace() 可在调用前覆盖。
@@ -211,7 +226,7 @@ function ask(question) {
     output: process.stdout,
   });
   return new Promise(resolve => {
-    rl.question(question, answer => {
+    rl.question('  ' + question, answer => {
       rl.close();
       resolve(answer.trim());
     });
@@ -623,22 +638,29 @@ const OPENSPEC_REGISTRY = 'https://registry.npmmirror.com';
 /**
  * 确保 OpenSpec CLI 已安装且为最新版本。
  * 未安装或版本非最新时自动执行 npm install -g，无需用户确认。
+ * 命令异步执行（execFile）避免阻塞事件循环——否则长耗时的 npm 查询/安装
+ * 会让进度行冻结、看起来像卡死；传入 onProgress 时由调用方渲染实时进度，
+ * 否则退化为安装/升级前的一行灰字提示。
  */
-async function ensureOpenSpecCli() {
+async function ensureOpenSpecCli(onProgress = null) {
+  const report = text => { if (onProgress) onProgress(text); };
+
   // 1. 获取当前版本（未安装时 currentVersion = null）
   let currentVersion = null;
+  report('检查 OpenSpec CLI');
   try {
-    currentVersion = execSync('openspec --version', { stdio: 'pipe', timeout: 10000 })
-      .toString().trim().replace(/^v/, '');
+    const { stdout } = await execCmd('openspec', ['--version'], { timeout: 10000 });
+    currentVersion = stdout.toString().trim().replace(/^v/, '');
   } catch (_) {}
 
   // 2. 查询最新版本（网络失败则跳过检测，视为无法判断）
   let latestVersion = null;
   try {
-    latestVersion = execSync(
-      `npm view ${OPENSPEC_PKG} version --registry ${OPENSPEC_REGISTRY}`,
-      { stdio: 'pipe', timeout: 15000 }
-    ).toString().trim();
+    const { stdout } = await execCmd(
+      'npm', ['view', OPENSPEC_PKG, 'version', '--registry', OPENSPEC_REGISTRY],
+      { timeout: 15000 }
+    );
+    latestVersion = stdout.toString().trim();
   } catch (_) {}
 
   // 3. 判断是否需要安装/升级
@@ -650,17 +672,20 @@ async function ensureOpenSpecCli() {
     return { state: 'ok', version: currentVersion };
   }
 
-  // 4. 执行安装/升级（耗时操作，打印进行中提示）
+  // 4. 执行安装/升级（耗时操作：由调用方进度行或灰字提示覆盖全程）
   const action = needInstall ? '安装' : '升级';
   const detail = needInstall
     ? `→ v${latestVersion || 'latest'}`
     : `v${currentVersion} → v${latestVersion}`;
-  console.log(`  ${c('gray', '⏳')} ${c('gray', `${action} OpenSpec CLI（${detail}）...`)}`);
+  report(`${action} OpenSpec CLI（${detail}）`);
+  if (!onProgress) {
+    console.log(`  ${c('gray', '⏳')} ${c('gray', `${action} OpenSpec CLI（${detail}）...`)}`);
+  }
 
   try {
-    execSync(
-      `npm install -g ${OPENSPEC_PKG}@latest --registry ${OPENSPEC_REGISTRY}`,
-      { stdio: 'pipe', timeout: 120000 }
+    await execCmd(
+      'npm', ['install', '-g', `${OPENSPEC_PKG}@latest`, '--registry', OPENSPEC_REGISTRY],
+      { timeout: 120000 }
     );
     return { state: needInstall ? 'installed' : 'upgraded', version: latestVersion || currentVersion };
   } catch (err) {
@@ -799,7 +824,12 @@ async function init(targetDir, options = {}) {
   const selectedAdapters = isNonInteractive ? adapters : await selectTools(isUpgrade);
 
   // 前置依赖检测（放在选适配器之后，只检测与所选工具相关的依赖）
-  await ensureOpenSpecCli();
+  const depProgress = progress('依赖');
+  try {
+    await ensureOpenSpecCli(t => depProgress.update(t));
+  } finally {
+    depProgress.done();
+  }
 
   // 分发核心规则到各工具目录
   console.log(`\n  📦 ${action}核心编码规范...`);
@@ -943,7 +973,7 @@ async function init(targetDir, options = {}) {
   if (isUpgrade) {
     const oldPaths = pathsToDelete(managedPaths, newPaths);
     if (oldPaths.length > 0) {
-      section('🧹', `清理上一版本残留（${oldPaths.length} 个）`);
+      section('!', `清理上一版本残留（${oldPaths.length} 个）`);
       // 先全部删除
       oldPaths.forEach(oldPath => {
         const targetPath = path.join(TARGET_DIR, oldPath);
@@ -959,7 +989,7 @@ async function init(targetDir, options = {}) {
 
     const kept = protectedKeptPaths(managedPaths, newPaths);
     if (kept.length > 0) {
-      section('🛡️', '保留用户文档');
+      section('!', '保留用户文档');
       kept.forEach(k => {
         log(`  ${k}（本包已不再管理，文件可能含用户内容，未删除）`, 'warn');
       });
@@ -1058,8 +1088,6 @@ async function installWorkspaceConfig(targetDir, options = {}) {
       selectedAdapters = await selectTools(isUpgrade);
     }
   }
-  const openspecCli = await ensureOpenSpecCli();
-
   // 只装 worktree 生命周期管理 Skills（init/close/push）
   const skillsAdapters = selectedAdapters.filter(a => a.skillsDir);
   const commandsAdapters = selectedAdapters.filter(a => a.worktreeCommandsDir);
@@ -1067,48 +1095,63 @@ async function installWorkspaceConfig(targetDir, options = {}) {
   let cmdCount = 0;
   let adapterRoots = [];
 
-  if (skillsAdapters.length > 0) {
-    const openspecExtendsSkillsSrc = path.join(SHARED_STANDARDS_DIR, 'cbb', 'worktrees', 'skills');
-    const osExtFilter = ['cbb-worktree-init', 'cbb-worktree-close', 'cbb-worktree-push'];
-    skillsAdapters.forEach(adapter => {
-      const r = deploySkills(adapter, isUpgrade, managedPaths, openspecExtendsSkillsSrc, osExtFilter);
-      if (r.count > 0) {
-        skillCount = Math.max(skillCount, r.count);
-        r.names.forEach(name => newPaths.add(`${adapter.skillsDir}/${name}`));
-      }
-    });
-    adapterRoots = skillsAdapters.map(a => a.skillsDir.split('/')[0]);
-  }
+  // 「AI 配置」阶段心跳：检查依赖 → 部署 skills/commands → 写入 openspec 配置 → 生成导航。
+  // 其中 npm 查询/安装最长可达分钟级，必须让用户看到进程仍活着；任何异常先清掉进度行。
+  const cfgProgress = progress('AI 配置');
+  let agentsMdState = 'exists';
+  let openspecRes;
+  try {
+    await ensureOpenSpecCli(t => cfgProgress.update(t));
 
-  // 只装 worktree 管理 Commands（cbb:worktree-init/close/push）
-  if (commandsAdapters.length > 0) {
-    const commandsExtendsSrc = path.join(SHARED_STANDARDS_DIR, 'cbb', 'worktrees', 'commands');
-    const cmdFilter = ['worktree-init.md', 'worktree-close.md', 'worktree-push.md'];
-    commandsAdapters.forEach(adapter => {
-      const r = deployWorktreeCommands(adapter, commandsExtendsSrc, cmdFilter);
-      if (r.count > 0) {
-        cmdCount = Math.max(cmdCount, r.count);
-        r.names.forEach(name => newPaths.add(`${adapter.worktreeCommandsDir}/${name}`));
-      }
-    });
-    if (adapterRoots.length === 0) adapterRoots = commandsAdapters.map(a => a.worktreeCommandsDir.split('/')[0]);
-  }
+    if (skillsAdapters.length > 0) {
+      cfgProgress.update('部署 skills');
+      const openspecExtendsSkillsSrc = path.join(SHARED_STANDARDS_DIR, 'cbb', 'worktrees', 'skills');
+      const osExtFilter = ['cbb-worktree-init', 'cbb-worktree-close', 'cbb-worktree-push'];
+      skillsAdapters.forEach(adapter => {
+        const r = deploySkills(adapter, isUpgrade, managedPaths, openspecExtendsSkillsSrc, osExtFilter);
+        if (r.count > 0) {
+          skillCount = Math.max(skillCount, r.count);
+          r.names.forEach(name => newPaths.add(`${adapter.skillsDir}/${name}`));
+        }
+      });
+      adapterRoots = skillsAdapters.map(a => a.skillsDir.split('/')[0]);
+    }
 
-  // 设置 OpenSpec 工作流（config.yaml + schemas）
-  const schemasSrcs = [
-    path.join(SHARED_STANDARDS_DIR, 'config', 'openspec', 'schemas'),
-  ];
-  schemasSrcs.forEach(src => {
-    if (fs.existsSync(src)) {
-      fs.readdirSync(src).filter(f2 => fs.statSync(path.join(src, f2)).isDirectory())
-        .forEach(name => newPaths.add(`openspec/schemas/${name}`));
+    // 只装 worktree 管理 Commands（cbb:worktree-init/close/push）
+    if (commandsAdapters.length > 0) {
+      cfgProgress.update('部署 worktree 命令');
+      const commandsExtendsSrc = path.join(SHARED_STANDARDS_DIR, 'cbb', 'worktrees', 'commands');
+      const cmdFilter = ['worktree-init.md', 'worktree-close.md', 'worktree-push.md'];
+      commandsAdapters.forEach(adapter => {
+        const r = deployWorktreeCommands(adapter, commandsExtendsSrc, cmdFilter);
+        if (r.count > 0) {
+          cmdCount = Math.max(cmdCount, r.count);
+          r.names.forEach(name => newPaths.add(`${adapter.worktreeCommandsDir}/${name}`));
+        }
+      });
+      if (adapterRoots.length === 0) adapterRoots = commandsAdapters.map(a => a.worktreeCommandsDir.split('/')[0]);
     }
-  });
-  const openspecRes = setupOpenSpec(isUpgrade, managedPaths);
-  newPaths.add('openspec/config.yaml');
 
-  // 空间导航文件 AGENTS.md：仅缺失时生成，永不覆盖（不登记清单，卸载不删）
-  const agentsMdState = workspaces.ensureWorkspaceAgentsMd(TARGET_DIR);
+    // 设置 OpenSpec 工作流（config.yaml + schemas）
+    cfgProgress.update('写入 openspec 配置');
+    const schemasSrcs = [
+      path.join(SHARED_STANDARDS_DIR, 'config', 'openspec', 'schemas'),
+    ];
+    schemasSrcs.forEach(src => {
+      if (fs.existsSync(src)) {
+        fs.readdirSync(src).filter(f2 => fs.statSync(path.join(src, f2)).isDirectory())
+          .forEach(name => newPaths.add(`openspec/schemas/${name}`));
+      }
+    });
+    openspecRes = setupOpenSpec(isUpgrade, managedPaths);
+    newPaths.add('openspec/config.yaml');
+
+    // 空间导航文件 AGENTS.md：仅缺失时生成，永不覆盖（不登记清单，卸载不删）
+    cfgProgress.update('生成空间导航');
+    agentsMdState = workspaces.ensureWorkspaceAgentsMd(TARGET_DIR);
+  } finally {
+    cfgProgress.done();
+  }
 
   // 升级时清理旧路径（workspace 曾装过的 base 工作流等不属于此子集，删除）
   const cleaned = [];
@@ -1149,11 +1192,11 @@ async function installWorkspaceConfig(targetDir, options = {}) {
   if (cleaned.length > 0) {
     const MAX_DISPLAY = 3;
     const preview = cleaned.slice(0, MAX_DISPLAY).join('、');
-    step('🧹', '清理残留', `${cleaned.length} 个（${preview}${cleaned.length > MAX_DISPLAY ? ' 等' : ''}）`,
+    step('!', '清理残留', `${cleaned.length} 个（${preview}${cleaned.length > MAX_DISPLAY ? ' 等' : ''}）`,
       { iconColor: 'yellow' });
   }
   if (keptDocs.length > 0) {
-    step('🛡️', '保留文档', `${keptDocs.join('、')}（本包已不再管理）`, { iconColor: 'yellow' });
+    step('!', '保留文档', `${keptDocs.join('、')}（本包已不再管理）`, { iconColor: 'yellow' });
   }
 }
 
@@ -1341,9 +1384,8 @@ async function syncWorkspaceRepo(targetDir, onProgress = () => {}) {
   if (currentBranch !== defaultBranch) {
     log(`本地当前分支 ${currentBranch} ≠ 远程默认分支 ${defaultBranch}，正在切换...`, 'warn');
     try {
-      execSync(`git checkout -q "${defaultBranch}"`, {
+      await execFileAsync('git', ['checkout', '-q', defaultBranch], {
         cwd: targetDir,
-        stdio: 'pipe',
         timeout: 30000,
       });
     } catch (e) {
@@ -1355,9 +1397,8 @@ async function syncWorkspaceRepo(targetDir, onProgress = () => {}) {
 
   // 4. fast-forward merge 到 origin/<默认分支>
   try {
-    execSync(`git merge --ff-only -q "origin/${defaultBranch}"`, {
+    await execFileAsync('git', ['merge', '--ff-only', '-q', `origin/${defaultBranch}`], {
       cwd: targetDir,
-      stdio: 'pipe',
       timeout: 60000,
     });
   } catch (e) {
@@ -1515,7 +1556,7 @@ function printBatchSummary(results) {
   }
   step('!', '完成', `成功 ${ok.length}/${results.length}，失败项见下`, { iconColor: 'yellow', valueColor: 'yellow' });
   failed.forEach(r => {
-    step('✗', r.w.name, describeBatchError(r), { iconColor: 'red', labelColor: 'red', valueColor: 'red' });
+    step('✗', '失败', `${r.w.name}：${describeBatchError(r)}`, { iconColor: 'red', labelColor: 'red', valueColor: 'red' });
   });
 }
 
@@ -1609,7 +1650,6 @@ async function setupWorkspace() {
     const result = await initSingleWorkspace(w, { selectedAdapters });
     results.push({ w, ...result });
   }
-  console.log('');
   printBatchSummary(results);
 }
 
@@ -1620,11 +1660,11 @@ function printSetupSummary(selected, selectedAdapters, parentDir) {
   console.log('  ' + c('bold', 'cbb setup') + '  ' + c('gray', `v${pkg.version}`));
   console.log('');
   selected.forEach(w => {
-    console.log(`    ${c('yellow', '[' + w.businessLine + ']')} ${w.name}`);
-    console.log(`      ${c('gray', w.repo)}`);
+    console.log(`  ${c('yellow', '[' + w.businessLine + ']')} ${w.name}`);
+    console.log(`    ${c('gray', w.repo)}`);
   });
-  console.log('    ' + c('gray', padVisual('目标目录', 10)) + ' ' + c('cyan', parentDir));
-  console.log('    ' + c('gray', padVisual('AI 工具', 10)) + ' ' + selectedAdapters.map(a => a.displayName).join('、'));
+  console.log('  ' + c('gray', padVisual('目标目录', 10)) + ' ' + c('cyan', parentDir));
+  console.log('  ' + c('gray', padVisual('AI 工具', 10)) + ' ' + selectedAdapters.map(a => a.displayName).join('、'));
 }
 
 // ── 用户级组件 ────────────────────────────────────────────
@@ -1822,7 +1862,7 @@ async function uninstall() {
   const managedPaths = readManifest();
 
   // 确认卸载
-  console.log('\n🗑  卸载 @jspg-ai/coding-bb...\n');
+  console.log('\n  🗑  卸载 @jspg-ai/coding-bb...\n');
   const answer = await ask('确认卸载？此操作将移除本包管理的所有文件 (y/N): ');
   if (answer.toLowerCase() !== 'y') {
     log('已取消卸载');

package/cbb/lib/utils/checkbox.js

@@ -87,8 +87,8 @@ function renderLines(state) {
   const lines = [];
 
   if (header) {
-    lines.push(c('bold', header));
-    lines.push(c('gray', '─'.repeat(48)));
+    lines.push('  ' + c('bold', header));
+    lines.push('  ' + c('gray', '─'.repeat(48)));
   }
 
   if (items.length === 0) {
@@ -99,21 +99,21 @@ function renderLines(state) {
       const isSelected = selected.has(i);
       const cursorMark = isCursor ? c('cyan', '❯') : ' ';
       const checkMark = isSelected ? c('green', '☑') : c('gray', '☐');
-      const raw = `  ${cursorMark} ${checkMark} ${item.label}`;
+      const raw = `    ${cursorMark} ${checkMark} ${item.label}`;
       // 当前行整体加粗 + 反转视频：浅色终端也能识别
       const line = isCursor && COLOR_ENABLED
         ? `${COLOR.bold}${COLOR.reverse}${raw}${COLOR.reset}`
         : (isCursor ? c('bold', raw) : raw);
       lines.push(line);
       if (item.hint) {
-        lines.push(c('gray', '        ' + item.hint));
+        lines.push(c('gray', '          ' + item.hint));
       }
     });
   }
 
   if (footer) {
     lines.push('');
-    lines.push(c('gray', footer));
+    lines.push('  ' + c('gray', footer));
   }
 
   return lines;
@@ -325,21 +325,21 @@ function promptCheckboxFallback({ items, header, footer, preSelected }) {
     };
 
     // 输出列表（无光标、无高亮，逐项标号）
-    console.log(c('bold', header) || '');
-    console.log(c('gray', '─'.repeat(48)));
+    console.log('  ' + (c('bold', header) || ''));
+    console.log('  ' + c('gray', '─'.repeat(48)));
     items.forEach((item, i) => {
-      console.log(`  ${c('cyan', String(i + 1) + '.')} ${item.label}`);
-      if (item.hint) console.log(c('gray', '        ' + item.hint));
+      console.log(`    ${c('cyan', String(i + 1) + '.')} ${item.label}`);
+      if (item.hint) console.log(c('gray', '          ' + item.hint));
     });
     console.log('');
-    if (footer) console.log(c('gray', footer));
+    if (footer) console.log('  ' + c('gray', footer));
 
     const rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout,
     });
 
-    rl.question(`请输入编号（多选用逗号分隔）: `, (answer) => {
+    rl.question(`  请输入编号（多选用逗号分隔）: `, (answer) => {
       rl.close();
       const selected = parseBulkInput(answer, items.length);
       resolve(selected);

package/cbb/lib/utils/output.js

@@ -37,34 +37,51 @@ const LOG_STYLES = {
 
 function log(msg, type = 'info') {
   const s = LOG_STYLES[type] || LOG_STYLES.info;
-  const text = `${s.icon} ${msg}`;
+  const text = `  ${s.icon} ${msg}`;
   console.log(s.color ? c(s.color, text) : text);
 }
 
 /** 输出一行分节标题（带图标 + 颜色），紧跟一行灰色分隔线 */
 function section(icon, title) {
   console.log('');
-  console.log(c('bold', `${icon}  ${title}`));
-  console.log(c('gray', '─'.repeat(48)));
+  console.log('  ' + c('bold', `${icon}  ${title}`));
+  console.log('  ' + c('gray', '─'.repeat(48)));
+}
+
+/** 单字符视觉宽度：CJK / 全角按 2 列计，其余按 1 列 */
+function charWidth(ch) {
+  const cp = ch.codePointAt(0);
+  const wide =
+    (cp >= 0x1100 && cp <= 0x115f) ||
+    cp === 0x2329 || cp === 0x232a ||
+    (cp >= 0x2e80 && cp <= 0xa4cf && cp !== 0x303f) ||
+    (cp >= 0xac00 && cp <= 0xd7a3) ||
+    (cp >= 0xf900 && cp <= 0xfaff) ||
+    (cp >= 0xfe30 && cp <= 0xfe6f) ||
+    (cp >= 0xff00 && cp <= 0xff60) ||
+    (cp >= 0xffe0 && cp <= 0xffe6);
+  return wide ? 2 : 1;
 }
 
 /** 视觉宽度：CJK / 全角字符按 2 列计，其余按 1 列（终端对齐用） */
 function visualWidth(text) {
   let w = 0;
+  for (const ch of String(text)) w += charWidth(ch);
+  return w;
+}
+
+/** 按视觉宽度截断文本（超出补 …），用于防止进度行折行残留 */
+function sliceVisual(text, maxWidth) {
+  if (visualWidth(text) <= maxWidth) return text;
+  let w = 0;
+  let out = '';
   for (const ch of String(text)) {
-    const cp = ch.codePointAt(0);
-    const wide =
-      (cp >= 0x1100 && cp <= 0x115f) ||
-      cp === 0x2329 || cp === 0x232a ||
-      (cp >= 0x2e80 && cp <= 0xa4cf && cp !== 0x303f) ||
-      (cp >= 0xac00 && cp <= 0xd7a3) ||
-      (cp >= 0xf900 && cp <= 0xfaff) ||
-      (cp >= 0xfe30 && cp <= 0xfe6f) ||
-      (cp >= 0xff00 && cp <= 0xff60) ||
-      (cp >= 0xffe0 && cp <= 0xffe6);
-    w += wide ? 2 : 1;
+    const cw = charWidth(ch);
+    if (w + cw > maxWidth - 1) return out + '…';
+    out += ch;
+    w += cw;
   }
-  return w;
+  return out;
 }
 
 /** 按视觉宽度右补空格（中文标签对齐用） */
@@ -96,7 +113,11 @@ function progress(label, opts = {}) {
 
   const render = () => {
     const sec = elapsed();
-    const value = sec > 0 ? `${text} ${c('gray', sec + 's')}` : text;
+    // 按终端宽度截断内容，防止折行后 \x1b[2K 清不净留下残影
+    const cols = stream.columns || 0;
+    const maxText = cols > 0 ? Math.max(16, cols - 22) : 0;
+    const shown = maxText > 0 ? sliceVisual(text, maxText) : text;
+    const value = sec > 0 ? `${shown} ${c('gray', sec + 's')}` : shown;
     stream.write(`\r\x1b[2K${head(SPINNER_FRAMES[frame++ % SPINNER_FRAMES.length])} ${value}`);
   };
 
@@ -146,6 +167,7 @@ module.exports = {
   log,
   section,
   visualWidth,
+  sliceVisual,
   padVisual,
   progress,
   step,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jspg-ai/coding-bb",
-  "version": "0.0.2-beta.28",
+  "version": "0.0.2-beta.29",
   "description": "整合业界热门且高价值的工具、框架与技能，为 AI CODING AGENT 提供统一的行为准则与工作流，辅助开发者将需求高效落地为符合规范的代码",
   "main": "cbb/lib/install/init.js",
   "bin": {