prizmkit 1.0.13 → 1.0.15

package/src/index.js

@@ -5,10 +5,9 @@
  * 然后调用 scaffold.js 执行纯净安装。
  */
 
-import { select, confirm } from '@inquirer/prompts';
+import { select, confirm, input } from '@inquirer/prompts';
 import chalk from 'chalk';
 import path from 'path';
-import fs from 'fs-extra';
 import { detectPlatform } from './detect-platform.js';
 import { scaffold } from './scaffold.js';
 import { loadMetadata } from './metadata.js';
@@ -34,6 +33,7 @@ export async function runScaffold(directory, options) {
   const cliStatus = [
     detected.cbc ? chalk.green('cbc ✓') : chalk.gray('cbc ✗'),
     detected.claude ? chalk.green('claude ✓') : chalk.gray('claude ✗'),
+    detected.claudeInternal ? chalk.green('claude-internal ✓') : chalk.gray('claude-internal ✗'),
   ].join('  ');
   console.log(`  检测到的 CLI 工具:  ${cliStatus}`);
   console.log(`  目标目录:          ${projectRoot}`);
@@ -54,6 +54,9 @@ export async function runScaffold(directory, options) {
       skills: options.skills || 'full',
       team: options.team !== false,
       pipeline: options.pipeline !== false,
+      rules: options.rules || 'recommended',
+      aiCli: options.aiCli || '',
+      externalSkills: options.externalSkills ? options.externalSkills.split(',').map(s => s.trim()).filter(Boolean) : [],
       projectRoot,
       dryRun: options.dryRun || false,
     };
@@ -62,16 +65,16 @@ export async function runScaffold(directory, options) {
 
   // === 交互式模式 ===
   try {
-    // 1. 选择平台
+    // 1. 选择平台（控制安装的目录结构）
     const platform = await select({
-      message: '选择目标平台:',
+      message: '选择目标平台 (决定安装的目录结构):',
       choices: [
         {
-          name: `CodeBuddy CLI (cbc)${detected.cbc ? chalk.green(' ← 已检测到') : ''}`,
+          name: `CodeBuddy (.codebuddy/)${detected.cbc ? chalk.green(' ← 已检测到 cbc') : ''}`,
           value: 'codebuddy',
         },
         {
-          name: `Claude Code CLI (claude)${detected.claude ? chalk.green(' ← 已检测到') : ''}`,
+          name: `Claude Code (.claude/)${(detected.claude || detected.claudeInternal) ? chalk.green(' ← 已检测到') : ''}`,
           value: 'claude',
         },
         {
@@ -82,8 +85,14 @@ export async function runScaffold(directory, options) {
       default: detected.suggested,
     });
 
+    // 1.5. AI CLI 命令配置（独立于平台，决定实际运行的可执行命令）
+    const aiCli = await input({
+      message: '底层 AI CLI 可执行命令 (可自定义，如 claude-internal --dangerously-skip-permissions):',
+      default: detected.suggestedCli,
+    });
+
     // 2. 选择技能套件
-    const skillSuite = await select({
+    const skillSuiteChoice = await select({
       message: '选择技能套件:',
       choices: [
         {
@@ -98,10 +107,41 @@ export async function runScaffold(directory, options) {
           name: `Minimal — 最小可用 (${metadata.suites.minimal.skills.length} 个技能)`,
           value: 'minimal',
         },
+        {
+          name: 'Recommended — 按项目类型推荐 ▸',
+          value: 'recommended',
+        },
       ],
       default: 'full',
     });
 
+    let skillSuite = skillSuiteChoice;
+    if (skillSuiteChoice === 'recommended') {
+      const projectType = await select({
+        message: '选择项目类型:',
+        choices: Object.entries(metadata.recommendations || {}).map(([key, val]) => ({
+          name: val.label,
+          value: `recommended:${key}`,
+        })),
+      });
+      skillSuite = projectType;
+    }
+
+    // 2.5. 外部 Skill 选择（可选）
+    let selectedExternalSkills = [];
+    const knownExternalSkills = metadata.external_skills?.known || [];
+    if (knownExternalSkills.length > 0) {
+      const { checkbox } = await import('@inquirer/prompts');
+      selectedExternalSkills = await checkbox({
+        message: '选择要安装的第三方 Skills（可选，需要网络）:',
+        choices: knownExternalSkills.map(s => ({
+          name: `${s.name} — ${s.description}`,
+          value: s.name,
+          checked: false,
+        })),
+      });
+    }
+
     // 3. 团队模式
     const team = await confirm({
       message: '启用多 Agent 团队模式 (prizm-dev-team)?',
@@ -114,12 +154,24 @@ export async function runScaffold(directory, options) {
       default: true,
     });
 
+    // 5. Rules 预设
+    const rulesPreset = await select({
+      message: '安装 AI 行为规则 (rules):',
+      choices: [
+        { name: 'Recommended — 全部规则 (推荐)', value: 'recommended' },
+        { name: 'Minimal — 仅渐进式加载 + 通用规则', value: 'minimal' },
+        { name: 'None — 不安装规则', value: 'none' },
+      ],
+      default: 'recommended',
+    });
+
     // 显示安装摘要
     const platformLabel = platform === 'both' ? 'CodeBuddy + Claude Code'
       : platform === 'codebuddy' ? 'CodeBuddy' : 'Claude Code';
     const suiteLabel = skillSuite === 'full' ? `Full (${totalSkills} 个)`
       : skillSuite === 'core' ? `Core (${metadata.suites.core.skills.length} 个)`
-      : `Minimal (${metadata.suites.minimal.skills.length} 个)`;
+      : skillSuite === 'minimal' ? `Minimal (${metadata.suites.minimal.skills.length} 个)`
+      : `Recommended (${skillSuite})`;
 
     console.log('');
     console.log(chalk.bold('  安装摘要:'));
@@ -127,6 +179,9 @@ export async function runScaffold(directory, options) {
     console.log(`    技能:       ${chalk.cyan(suiteLabel)}`);
     console.log(`    团队模式:   ${team ? chalk.green('启用') : chalk.gray('禁用')}`);
     console.log(`    流水线:     ${pipeline ? chalk.green('启用') : chalk.gray('禁用')}`);
+    console.log(`    规则:       ${chalk.cyan(rulesPreset)}`);
+    if (aiCli) console.log(`    AI CLI:     ${chalk.cyan(aiCli)}`);
+    if (selectedExternalSkills.length > 0) console.log(`    外部技能:   ${chalk.cyan(selectedExternalSkills.join(', '))}`);
     console.log(`    目标目录:   ${projectRoot}`);
     console.log('');
 
@@ -146,6 +201,9 @@ export async function runScaffold(directory, options) {
       skills: skillSuite,
       team,
       pipeline,
+      rules: rulesPreset,
+      aiCli: aiCli || '',
+      externalSkills: selectedExternalSkills,
       projectRoot,
       dryRun: options.dryRun || false,
     };

package/src/metadata.js

@@ -51,6 +51,7 @@ export async function loadMetadata() {
 
   throw new Error(
     '无法找到 Skill 元数据文件。\n' +
+    `尝试路径：\n  1. ${bundledPath}\n  2. ${corePath}\n` +
     '请确保在 PrizmKit 框架目录中运行，或已执行 `npm run bundle` 打包资源。'
   );
 }
@@ -131,4 +132,39 @@ export function getAdaptersDir() {
   if (fs.pathExistsSync(coreDir)) return coreDir;
 
   throw new Error('无法找到 Adapters 目录。');
+}
+
+/**
+ * 获取 core rules 目录路径
+ */
+export function getRulesDir() {
+  const bundledDir = path.join(getBundledRoot(), 'rules');
+  const coreDir = path.join(getFrameworkRoot(), 'core', 'rules');
+
+  if (fs.pathExistsSync(bundledDir)) return bundledDir;
+  if (fs.pathExistsSync(coreDir)) return coreDir;
+
+  throw new Error('无法找到 Rules 目录。');
+}
+
+/**
+ * 加载 Rules 元数据
+ * @returns {Promise<Object>} metadata 对象（包含 rules 和 presets）
+ */
+export async function loadRulesMetadata() {
+  const bundledPath = path.join(getBundledRoot(), 'rules', '_rules-metadata.json');
+  const corePath = path.join(getFrameworkRoot(), 'core', 'rules', '_rules-metadata.json');
+
+  if (await fs.pathExists(bundledPath)) {
+    return fs.readJSON(bundledPath);
+  }
+
+  if (await fs.pathExists(corePath)) {
+    return fs.readJSON(corePath);
+  }
+
+  throw new Error(
+    '无法找到 Rules 元数据文件。\n' +
+    `尝试路径：\n  1. ${bundledPath}\n  2. ${corePath}`
+  );
 }

package/src/scaffold.js

@@ -18,7 +18,8 @@ import {
   getTemplatesDir,
   getPipelineDir,
   getAdaptersDir,
-  getFrameworkRoot,
+  getRulesDir,
+  loadRulesMetadata,
 } from './metadata.js';
 import { generateGitignore } from './gitignore-template.js';
 
@@ -51,6 +52,20 @@ async function loadSharedFrontmatter() {
 async function resolveSkillList(suite) {
   const metadata = await loadMetadata();
 
+  // 处理 recommended:<type> 格式
+  if (suite && suite.startsWith('recommended:')) {
+    const projectType = suite.split(':')[1];
+    const rec = metadata.recommendations?.[projectType];
+    if (rec) {
+      const baseSkills = rec.base === '*'
+        ? Object.keys(metadata.skills)
+        : [...(metadata.suites[rec.base]?.skills || [])];
+      const includeSkills = rec.include || [];
+      const excludeSkills = new Set(rec.exclude || []);
+      return [...new Set([...baseSkills, ...includeSkills])].filter(s => !excludeSkills.has(s));
+    }
+  }
+
   const suiteDef = metadata.suites[suite] || metadata.suites.full;
   if (suiteDef.skills === '*') {
     return Object.keys(metadata.skills);
@@ -68,6 +83,13 @@ async function resolveSkillList(suite) {
 async function installSkills(platform, skills, projectRoot, dryRun) {
   const skillsDir = getSkillsDir();
   const { parseFrontmatter, buildMarkdown } = await loadSharedFrontmatter();
+  
+  // Load metadata to get skill -> category mapping
+  const metadata = await loadMetadata();
+  const skillCategories = {};
+  for (const [skillName, skillDef] of Object.entries(metadata.skills)) {
+    skillCategories[skillName] = skillDef.category;
+  }
 
   // Load Claude command adapter for skill conversion
   let convertSkillToCommand;
@@ -77,7 +99,31 @@ async function installSkills(platform, skills, projectRoot, dryRun) {
   }
 
   for (const skillName of skills) {
-    const corePath = path.join(skillsDir, skillName);
+    // Determine the category subdirectory (prizmkit-skill, prizmkit-tool-skill, Custom-skill)
+    const category = skillCategories[skillName];
+    if (!category) {
+      console.warn(`  ⚠ Skill ${skillName} has no category mapping in metadata, skipping`);
+      continue;
+    }
+
+    // Security: validate category and skillName contain no path traversal sequences.
+    if (category.includes('..') || category.includes('/') || skillName.includes('..') || skillName.includes('/')) {
+      console.warn(`  ⚠ Skill ${skillName} has invalid category or name, skipping`);
+      continue;
+    }
+
+    // Build path: prefer hierarchical layout (<skillsDir>/<category>/<skillName>),
+    // fallback to flat bundled layout (<skillsDir>/<skillName>) for npm package compatibility.
+    let corePath = path.resolve(skillsDir, category, skillName);
+    // Ensure resolved path stays within skillsDir
+    if (!corePath.startsWith(path.resolve(skillsDir))) {
+      console.warn(`  ⚠ Skill ${skillName} path escapes skills directory, skipping`);
+      continue;
+    }
+    if (!await fs.pathExists(corePath)) {
+      corePath = path.resolve(skillsDir, skillName);
+      if (!corePath.startsWith(path.resolve(skillsDir))) continue;
+    }
     if (!await fs.pathExists(corePath)) continue;
 
     const stat = await fs.stat(corePath);
@@ -292,11 +338,28 @@ async function installTeamConfig(platform, projectRoot, dryRun) {
  * 安装平台配置文件（settings/hooks/rules）
  */
 async function installSettings(platform, projectRoot, options, dryRun) {
+  // 从文件加载 rules
+  const rulesMeta = await loadRulesMetadata();
+  const rulesPreset = options.rules || 'recommended';
+  const preset = rulesMeta.presets[rulesPreset] || rulesMeta.presets.recommended;
+  const ruleNames = preset?.rules || [];
+  const rulesDir = getRulesDir();
+  const ruleFiles = [];
+  for (const name of ruleNames) {
+    const filePath = path.join(rulesDir, `${name}.md`);
+    if (await fs.pathExists(filePath)) {
+      ruleFiles.push({ name, content: await fs.readFile(filePath, 'utf8') });
+    }
+  }
+
   if (platform === 'codebuddy') {
     const settingsPath = path.join(projectRoot, '.codebuddy', 'settings.json');
 
     if (dryRun) {
       console.log(chalk.gray(`      [dry-run] .codebuddy/settings.json`));
+      if (ruleFiles.length > 0) {
+        console.log(chalk.gray(`      [dry-run] .codebuddy/rules/ (${ruleFiles.length} 条规则)`));
+      }
       return;
     }
 
@@ -309,12 +372,19 @@ async function installSettings(platform, projectRoot, options, dryRun) {
     await fs.writeFile(settingsPath, JSON.stringify(hookTemplate, null, 2));
     console.log(chalk.green(`      ✓ .codebuddy/settings.json`));
 
+    // Install rules for CodeBuddy
+    if (ruleFiles.length > 0) {
+      const { installRules: installCbRules } = await loadAdapter('codebuddy', 'rules-adapter.js');
+      await installCbRules(projectRoot, ruleFiles);
+      console.log(chalk.green(`      ✓ .codebuddy/rules/ (${ruleFiles.length} 条规则)`));
+    }
+
   } else if (platform === 'claude') {
     const claudeDir = path.join(projectRoot, '.claude');
 
     if (dryRun) {
       console.log(chalk.gray(`      [dry-run] .claude/settings.json`));
-      console.log(chalk.gray(`      [dry-run] .claude/rules/`));
+      console.log(chalk.gray(`      [dry-run] .claude/rules/ (${ruleFiles.length} 条规则)`));
       return;
     }
 
@@ -363,29 +433,64 @@ async function installSettings(platform, projectRoot, options, dryRun) {
     console.log(chalk.green(`      ✓ .claude/settings.json`));
 
     // Rules
-    const rulesDir = path.join(claudeDir, 'rules');
-    await fs.ensureDir(rulesDir);
+    const { installRules: installClaudeRules } = await loadAdapter('claude', 'rules-adapter.js');
+    await installClaudeRules(projectRoot, ruleFiles);
+    console.log(chalk.green(`      ✓ .claude/rules/ (${ruleFiles.length} 条规则)`));
+  }
+}
 
-    const rules = [
-      {
-        filename: 'prizm-documentation.md',
-        content: `---\ndescription: "PrizmKit documentation rules"\nglobs:\n  - "**/*.ts"\n  - "**/*.tsx"\n  - "**/*.js"\n  - "**/*.jsx"\n  - "**/*.py"\n  - "**/*.go"\n  - "**/*.rs"\n  - "**/*.java"\n---\n\nWhen modifying source files in this project:\n1. Check if \`.prizm-docs/root.prizm\` exists\n2. If it does, read it before making changes to understand project structure\n3. After making changes, update affected \`.prizm-docs/\` files\n4. Follow the Prizm doc format (KEY: value, not prose)\n5. Size limits: L0 = 4KB, L1 = 3KB, L2 = 5KB\n`,
-      },
-      {
-        filename: 'prizm-commit-workflow.md',
-        content: `---\ndescription: "PrizmKit commit workflow rules"\n---\n\nBefore any git commit in this project:\n1. Update \`.prizm-docs/\` for affected modules\n2. Use Conventional Commits format: type(scope): description\n3. Bug fixes use \`fix()\` prefix, not \`feat()\`\n4. Do NOT create REGISTRY.md entries for bug fixes\n5. Use \`/prizmkit-committer\` command for the complete commit workflow\n`,
-      },
-      {
-        filename: 'prizm-progressive-loading.md',
-        content: `---\ndescription: "PrizmKit progressive context loading protocol"\n---\n\nThis project uses PrizmKit's progressive loading protocol:\n- ON SESSION START: Read \`.prizm-docs/root.prizm\` (L0 — project map)\n- ON TASK: Read L1 (\`.prizm-docs/<module>.prizm\`) for relevant modules\n- ON FILE EDIT: Read L2 (\`.prizm-docs/<module>/<submodule>.prizm\`) before modifying\n- NEVER load all .prizm docs at once\n- Arrow notation (->) in .prizm files indicates load pointers\n- DECISIONS and CHANGELOG in .prizm files are append-only\n`,
-      },
-    ];
+/**
+ * 安装 git pre-commit hook（prizm 格式校验）
+ */
+async function installGitHook(projectRoot, dryRun) {
+  const gitDir = path.join(projectRoot, '.git');
 
-    for (const rule of rules) {
-      await fs.writeFile(path.join(rulesDir, rule.filename), rule.content);
-    }
-    console.log(chalk.green(`      ✓ .claude/rules/ (${rules.length} 条规则)`));
+  if (dryRun) {
+    console.log(chalk.gray('      [dry-run] .git/hooks/pre-commit (prizm format check)'));
+    return;
+  }
+
+  if (!fs.existsSync(gitDir)) return;
+
+  const templatePath = path.join(getTemplatesDir(), 'hooks', 'prizm-pre-commit.sh');
+  const hooksDir = path.join(gitDir, 'hooks');
+  const preCommitPath = path.join(hooksDir, 'pre-commit');
+
+  fs.mkdirSync(hooksDir, { recursive: true });
+
+  if (fs.existsSync(preCommitPath)) {
+    const existing = fs.readFileSync(preCommitPath, 'utf8');
+    if (existing.includes('PrizmKit')) return;
+    const hookContent = fs.readFileSync(templatePath, 'utf8');
+    fs.writeFileSync(preCommitPath, existing + '\n\n' + hookContent);
+  } else {
+    await fs.copy(templatePath, preCommitPath);
+    fs.chmodSync(preCommitPath, 0o755);
+  }
+
+  console.log(chalk.green('      ✓ .git/hooks/pre-commit (prizm format check)'));
+}
+
+/**
+ * 安装 validate-prizm-docs.sh 到 dev-pipeline/scripts/
+ */
+async function installValidateScript(projectRoot, dryRun) {
+  const sourcePath = path.join(getTemplatesDir(), 'hooks', 'validate-prizm-docs.sh');
+  if (!fs.existsSync(sourcePath)) return;
+
+  const targetDir = path.join(projectRoot, 'dev-pipeline', 'scripts');
+  const targetPath = path.join(targetDir, 'validate-prizm-docs.sh');
+
+  if (dryRun) {
+    console.log(chalk.gray('      [dry-run] dev-pipeline/scripts/validate-prizm-docs.sh'));
+    return;
   }
+
+  await fs.ensureDir(targetDir);
+  await fs.copy(sourcePath, targetPath);
+  fs.chmodSync(targetPath, 0o755);
+
+  console.log(chalk.green('      ✓ dev-pipeline/scripts/validate-prizm-docs.sh'));
 }
 
 /**
@@ -393,11 +498,19 @@ async function installSettings(platform, projectRoot, options, dryRun) {
  */
 async function installProjectMemory(platform, projectRoot, dryRun) {
   const templatesDir = getTemplatesDir();
+  const skillsDir = getSkillsDir();
   const templateName = platform === 'claude' ? 'claude-md-template.md' : 'codebuddy-md-template.md';
   const targetName = platform === 'claude' ? 'CLAUDE.md' : 'CODEBUDDY.md';
-  const templatePath = path.join(templatesDir, templateName);
   const targetPath = path.join(projectRoot, targetName);
 
+  // Prefer core/templates, fallback to prizm-kit/assets in hierarchical or flat skills layouts.
+  const templateCandidates = [
+    path.join(templatesDir, templateName),
+    path.join(skillsDir, 'prizmkit-skill', 'prizm-kit', 'assets', templateName),
+    path.join(skillsDir, 'prizm-kit', 'assets', templateName),
+  ];
+  const templatePath = templateCandidates.find(candidate => fs.pathExistsSync(candidate));
+
   if (await fs.pathExists(targetPath)) {
     console.log(chalk.yellow(`      ⚠ ${targetName} 已存在，跳过`));
     return;
@@ -408,7 +521,7 @@ async function installProjectMemory(platform, projectRoot, dryRun) {
     return;
   }
 
-  if (await fs.pathExists(templatePath)) {
+  if (templatePath && await fs.pathExists(templatePath)) {
     await fs.copy(templatePath, targetPath);
     console.log(chalk.green(`      ✓ ${targetName}`));
   } else {
@@ -492,14 +605,17 @@ async function installGitignore(projectRoot, options, dryRun) {
  * 执行纯净安装
  * @param {Object} config
  * @param {string} config.platform - 'codebuddy' | 'claude' | 'both'
- * @param {string} config.skills - 'full' | 'core' | 'minimal'
+ * @param {string} config.skills - 'full' | 'core' | 'minimal' | 'recommended:<type>'
  * @param {boolean} config.team - 是否启用团队模式
  * @param {boolean} config.pipeline - 是否安装 dev-pipeline
+ * @param {string} [config.rules] - Rules preset: 'recommended' | 'minimal' | 'none'
+ * @param {string} [config.aiCli] - AI CLI 可执行命令（写入 .prizmkit/config.json）
+ * @param {string[]} [config.externalSkills] - 要安装的外部 skill 名称列表
  * @param {string} config.projectRoot - 目标项目根目录
  * @param {boolean} config.dryRun - 是否为预览模式
  */
 export async function scaffold(config) {
-  const { platform, skills, team, pipeline, projectRoot, dryRun } = config;
+  const { platform, skills, team, pipeline, rules, aiCli, externalSkills, projectRoot, dryRun } = config;
   const platforms = platform === 'both' ? ['codebuddy', 'claude'] : [platform];
 
   if (dryRun) {
@@ -531,7 +647,7 @@ export async function scaffold(config) {
 
     // 4. Settings/Hooks/Rules
     console.log(chalk.blue('\n    平台配置:'));
-    await installSettings(p, projectRoot, { pipeline }, dryRun);
+    await installSettings(p, projectRoot, { pipeline, rules }, dryRun);
 
     // 5. Project Memory
     console.log(chalk.blue('\n    项目记忆文件:'));
@@ -551,6 +667,56 @@ export async function scaffold(config) {
   console.log(chalk.blue('    项目配置:'));
   await installGitignore(projectRoot, { pipeline }, dryRun);
 
+  // 8. 写入 .prizmkit/config.json（如果指定了 aiCli）
+  if (aiCli) {
+    const prizmkitDir = path.join(projectRoot, '.prizmkit');
+    const configPath = path.join(prizmkitDir, 'config.json');
+
+    if (dryRun) {
+      console.log(chalk.gray(`      [dry-run] .prizmkit/config.json (ai_cli: ${aiCli})`));
+    } else {
+      await fs.ensureDir(prizmkitDir);
+      let existingConfig = {};
+      if (await fs.pathExists(configPath)) {
+        existingConfig = await fs.readJSON(configPath);
+      }
+      existingConfig.ai_cli = aiCli;
+      await fs.writeJSON(configPath, existingConfig, { spaces: 2 });
+      console.log(chalk.green(`      ✓ .prizmkit/config.json (ai_cli: ${aiCli})`));
+    }
+  }
+
+  // 9. 安装外部 Skills（如果选择了）
+  if (externalSkills?.length) {
+    const { installExternalSkill } = await import('./external-skills.js');
+    const metadata = await loadMetadata();
+    const knownSkills = metadata.external_skills?.known || [];
+    console.log(chalk.blue('\n    外部技能:'));
+    for (const name of externalSkills) {
+      const skillDef = knownSkills.find(s => s.name === name);
+      if (skillDef) {
+        for (const p of platforms) {
+          try {
+            await installExternalSkill(skillDef, p, projectRoot, dryRun);
+            console.log(chalk.green(`      ✓ ${name} (external)`));
+          } catch (e) {
+            console.log(chalk.yellow(`      ⚠ ${name} 拉取失败，跳过: ${e.message}`));
+          }
+        }
+      }
+    }
+  }
+
+  // 10. Git pre-commit hook
+  console.log(chalk.blue('    Git Hook:'));
+  await installGitHook(projectRoot, dryRun);
+
+  // 11. Validate script (only if pipeline enabled)
+  if (pipeline) {
+    console.log(chalk.blue('    验证脚本:'));
+    await installValidateScript(projectRoot, dryRun);
+  }
+
   // === 完成 ===
   console.log('');
   console.log(chalk.bold('  ════════════════════════════════════════════════'));
@@ -565,7 +731,8 @@ export async function scaffold(config) {
   if (!dryRun) {
     // 打印下一步提示
     const mainPlatform = platforms.includes('claude') ? 'claude' : 'codebuddy';
-    const cli = mainPlatform === 'claude' ? 'claude' : 'cbc';
+    const defaultCli = mainPlatform === 'claude' ? 'claude' : 'cbc';
+    const cli = aiCli || defaultCli;
 
     console.log('');
     console.log('  下一步:');
@@ -581,16 +748,18 @@ export async function scaffold(config) {
     console.log('');
 
     // 安装统计
-    const metadata = await loadMetadata();
     const suiteLabel = skills === 'full' ? `全部 ${skillList.length} 个`
       : skills === 'core' ? `核心 ${skillList.length} 个`
-      : `最小 ${skillList.length} 个`;
+      : skills === 'minimal' ? `最小 ${skillList.length} 个`
+      : `推荐 ${skillList.length} 个`;
 
     console.log(chalk.gray(`  安装统计:`));
     console.log(chalk.gray(`    技能: ${suiteLabel}`));
     console.log(chalk.gray(`    平台: ${platforms.map(p => p === 'codebuddy' ? 'CodeBuddy' : 'Claude Code').join(' + ')}`));
     console.log(chalk.gray(`    团队: ${team ? '已启用' : '未启用'}`));
     console.log(chalk.gray(`    流水线: ${pipeline ? '已安装' : '未安装'}`));
+    console.log(chalk.gray(`    规则: ${rules || 'recommended'}`));
+    if (aiCli) console.log(chalk.gray(`    AI CLI: ${aiCli}`));
     console.log('');
   }
 }