sillyspec 3.20.1 → 3.20.3

package/src/init.js

@@ -1,6 +1,7 @@
-import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from 'fs';
+import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync, statSync } from 'fs';
 import { join, resolve, dirname, basename } from 'path';
 import { fileURLToPath } from 'url';
+import { homedir } from 'os';
 import { checkbox, confirm, input } from '@inquirer/prompts';
 import { ProgressManager } from './progress.js';
 import chalk from 'chalk';
@@ -27,10 +28,11 @@ function copyDirSync(src, dst) {
 
 
 
-const VALID_TOOLS = ['claude', 'cursor', 'openclaw', 'codex', 'gemini', 'opencode'];
+const VALID_TOOLS = ['claude', 'claude_skills', 'cursor', 'openclaw', 'codex', 'gemini', 'opencode'];
 
 const TOOL_LABELS = {
   claude: 'Claude Code',
+  claude_skills: 'Claude Skills',
   cursor: 'Cursor',
   openclaw: 'OpenClaw',
   codex: 'OpenAI Codex (通过 AGENTS.md)',
@@ -56,7 +58,7 @@ const INJECTION_CONTENT = `## SillySpec — 规范驱动开发
 - 遵循 \`.sillyspec/docs/<project>/scan/CONVENTIONS.md\` 中的代码风格
 
 ### 工作流程
-- 读取 sillyspec.db 确认当前阶段（使用 \`sillyspec progress show\`）
+- 读取 \`.sillyspec/.runtime/progress.json\` 确认当前阶段（使用 \`sillyspec progress show\`）
 - 各阶段产出文件位于 \`.sillyspec/changes/<变更名>/\` 下
 `;
 
@@ -86,6 +88,7 @@ function injectInstructions(tool, projectDir) {
 function detectTools(projectDir) {
   const found = [];
   if (existsSync(join(projectDir, '.claude'))) found.push('claude');
+  if (existsSync(join(projectDir, '.claude', 'skills'))) found.push('claude_skills');
   if (existsSync(join(projectDir, '.cursor'))) found.push('cursor');
   if (existsSync(join(projectDir, '.openclaw'))) found.push('openclaw');
   if (existsSync(join(projectDir, 'AGENTS.md'))) found.push('codex');
@@ -103,90 +106,34 @@ function isTTY() {
 
 // ── 核心安装逻辑 ──
 
-async function doInstall(projectDir, tools, subprojects = [], specDir = null) {
-  // specDir: 规范目录（默认 projectDir/.sillyspec）
-  // projectDir: 源码项目根目录（用于工具检测、指令注入、.gitignore）
-  const spec = specDir || join(projectDir, '.sillyspec');
-
-  // 外部 specDir 时清理旧版本残留的 cwd/.sillyspec/（防止源码污染）。
-  // ⚠️ 必须保护真实资产：若本地 .sillyspec 含 changes/（非空）、projects/（非空）
-  // 或 sillyspec.db（进度库），说明该项目本身就用 SillySpec 管理，整体删除会丢资产。
-  // 此时只清运行时残留，拒绝整删；确无资产时才视为旧残留清理。
-  const legacyDir = join(projectDir, '.sillyspec');
-  if (specDir && existsSync(legacyDir)) {
-    let hasChanges = false;
-    try {
-      const changesDir = join(legacyDir, 'changes');
-      if (existsSync(changesDir)) hasChanges = readdirSync(changesDir).length > 0;
-    } catch {}
-    let hasProjects = false;
-    try {
-      const projectsDir = join(legacyDir, 'projects');
-      if (existsSync(projectsDir)) hasProjects = readdirSync(projectsDir).length > 0;
-    } catch {}
-    const hasDb = existsSync(join(legacyDir, 'sillyspec.db'));
-
-    if (hasChanges || hasProjects || hasDb) {
-      // 真实资产存在：拒绝整体删除，仅清理运行时残留
-      console.error('❌ [sillyspec] 拒绝删除源码目录的 .sillyspec/：检测到真实资产（changes/、projects/ 或 sillyspec.db）。');
-      console.error('   该项目似乎本身就用 SillySpec 管理。如需改用外部 spec 目录，请先手动迁移/备份。');
-      console.error('   本次仅清理运行时残留（.runtime/、local.yaml、codebase/）。');
-      for (const residue of ['.runtime', 'local.yaml', 'codebase']) {
-        const p = join(legacyDir, residue);
-        if (existsSync(p)) { try { rmSync(p, { recursive: true, force: true }) } catch {} }
-      }
-    } else {
-      // 无真实资产：确属旧版本残留，安全删除
-      try { rmSync(legacyDir, { recursive: true, force: true }) } catch {}
-      if (!existsSync(legacyDir)) console.log('🧹 已清理旧版本残留的源码 .sillyspec/ 目录');
-      else console.error('⚠️ 清理残留 .sillyspec/ 失败');
-    }
-  }
-
+async function doInstall(projectDir, tools, subprojects = []) {
   // 创建基础目录
-  // spec/projects/    → 项目注册表
-  // spec/docs/<name>/ → 统一文档中心
-  // spec/knowledge/   → 跨项目共享知识库
-  // spec/.runtime/    → progress (gitignored)
+  // .sillyspec/projects/    → 项目注册表
+  // .sillyspec/docs/<name>/ → 统一文档中心
+  // .sillyspec/knowledge/   → 跨项目共享知识库
+  // .sillyspec/.runtime/    → progress (gitignored)
 
   // 注册当前项目到 projects/
   const projectName = basename(projectDir) || 'project';
-  const projectsDir = join(spec, 'projects');
+  const projectsDir = join(projectDir, '.sillyspec', 'projects');
   mkdirSync(projectsDir, { recursive: true });
   const projectYamlPath = join(projectsDir, `${projectName}.yaml`);
   if (!existsSync(projectYamlPath)) {
-    // path 相对于 specDir，跨平台可寻址
-    writeFileSync(projectYamlPath, `name: ${projectName}\npath: ${projectDir}\nstatus: active\n`);
+    writeFileSync(projectYamlPath, `name: ${projectName}\npath: .\nstatus: active\n`);
   }
 
   // 创建 docs/<projectName>/scan/ 子目录（代码扫描结果）
-  const scanDir = join(spec, 'docs', projectName, 'scan');
+  const scanDir = join(projectDir, '.sillyspec', 'docs', projectName, 'scan');
   mkdirSync(scanDir, { recursive: true });
   const gitkeepPath = join(scanDir, '.gitkeep');
   if (!existsSync(gitkeepPath)) writeFileSync(gitkeepPath, '');
 
-  // 复制 workflow 模板到 workflows/
-  const workflowsDir = join(spec, 'workflows');
-  const templatesDir = join(__dirname, '..', 'templates', 'workflows');
-  if (existsSync(templatesDir)) {
-    mkdirSync(workflowsDir, { recursive: true });
-    for (const file of readdirSync(templatesDir)) {
-      if (file.endsWith('.yaml')) {
-        const srcPath = join(templatesDir, file);
-        const dstPath = join(workflowsDir, file);
-        if (!existsSync(dstPath)) {
-          writeFileSync(dstPath, readFileSync(srcPath));
-        }
-      }
-    }
-  }
-
   // 创建 shared/workspace 目录
-  mkdirSync(join(spec, 'shared'), { recursive: true });
-  mkdirSync(join(spec, 'workspace'), { recursive: true });
+  mkdirSync(join(projectDir, '.sillyspec', 'shared'), { recursive: true });
+  mkdirSync(join(projectDir, '.sillyspec', 'workspace'), { recursive: true });
 
   // 创建知识库骨架
-  const knowledgeDir = join(spec, 'knowledge');
+  const knowledgeDir = join(projectDir, '.sillyspec', 'knowledge');
   mkdirSync(knowledgeDir, { recursive: true });
   const indexPath = join(knowledgeDir, 'INDEX.md');
   if (!existsSync(indexPath)) {
@@ -197,33 +144,38 @@ async function doInstall(projectDir, tools, subprojects = [], specDir = null) {
     writeFileSync(uncatPath, `# 未分类知识\n\n> execute/quick 执行中发现的坑暂存于此，用户审阅后归类到对应文件并更新 INDEX.md。\n`);
   }
 
-  // 创建 .runtime/ 目录结构（全局状态）
-  const runtimeDir = join(spec, '.runtime');
+  // 创建 .sillyspec/.runtime/ 目录结构
+  const runtimeDir = join(projectDir, '.sillyspec', '.runtime');
   for (const sub of ['artifacts', 'history', 'logs', 'templates']) {
     mkdirSync(join(runtimeDir, sub), { recursive: true });
   }
 
-  // 初始化 SQLite 数据库
-  const pm = new ProgressManager({ specDir: spec });
-  await pm.init(projectDir);
-
-  // .gitignore 只在 specDir 在项目内时才修改
-  const isExternalSpec = specDir && resolve(spec) !== resolve(projectDir, '.sillyspec');
- if (!isExternalSpec) {
-    const gitignorePath = join(projectDir, '.gitignore');
-    const ignoreRules = ['.sillyspec/codebase/SCAN-RAW.md', '.sillyspec/local.yaml', '.sillyspec/.runtime/'];
-    if (existsSync(gitignorePath)) {
-      const content = readFileSync(gitignorePath, 'utf8');
-      let updated = content.trimEnd();
-      for (const rule of ignoreRules) {
-        if (!updated.includes(rule)) {
-          updated += '\n' + rule;
-        }
+  // 创建初始 progress.json
+  const progressPath = join(runtimeDir, 'progress.json');
+  if (!existsSync(progressPath)) {
+    const pm = new ProgressManager();
+    pm.init(projectDir);
+  }
+
+  // 创建初始 user-inputs.md
+  const inputsPath = join(runtimeDir, 'user-inputs.md');
+  if (!existsSync(inputsPath)) {
+    writeFileSync(inputsPath, '# 用户输入记录\n\n> 每步完成时由 AI 自动追加，记录用户所有原话。\n\n');
+  }
+
+  const gitignorePath = join(projectDir, '.gitignore');
+  const ignoreRules = ['.sillyspec/codebase/SCAN-RAW.md', '.sillyspec/local.yaml', '.sillyspec/.runtime/'];
+  if (existsSync(gitignorePath)) {
+    const content = readFileSync(gitignorePath, 'utf8');
+    let updated = content.trimEnd();
+    for (const rule of ignoreRules) {
+      if (!updated.includes(rule)) {
+        updated += '\n' + rule;
       }
-      writeFileSync(gitignorePath, updated + '\n');
-    } else {
-      writeFileSync(gitignorePath, ignoreRules.join('\n') + '\n');
     }
+    writeFileSync(gitignorePath, updated + '\n');
+  } else {
+    writeFileSync(gitignorePath, ignoreRules.join('\n') + '\n');
   }
 
   // 注入指令文件（codex/gemini/opencode）
@@ -234,35 +186,29 @@ async function doInstall(projectDir, tools, subprojects = [], specDir = null) {
     }
   }
 
-  // 复制 skills 到各工具目录
-  const skillToolDirs = {
-    claude: '.claude/skills',
-    codex: '.codex/skills',
-    openclaw: '.openclaw/skills',
-    opencode: '.opencode/skills',
-  }
-  const skillsSource = join(__dirname, '..', '.claude', 'skills');
-  if (existsSync(skillsSource)) {
+  // 复制 skills 到 .claude/skills/（给 Claude Code 使用）
+  const claudeSkillsDir = join(projectDir, '.claude', 'skills');
+  // 优先从 npm 包自带位置复制，其次从 ~/.agents/skills/
+  const npmSkillsDir = join(__dirname, '..', '.claude', 'skills');
+  const localSkillsDir = join(homedir(), '.agents', 'skills');
+  const skillsSource = existsSync(npmSkillsDir) ? npmSkillsDir : existsSync(localSkillsDir) ? localSkillsDir : null;
+  if (skillsSource) {
     const sillyspecSkills = readdirSync(skillsSource).filter(f => f.startsWith('sillyspec-') && statSync(join(skillsSource, f)).isDirectory());
     if (sillyspecSkills.length > 0) {
-      for (const [tool, dir] of Object.entries(skillToolDirs)) {
-        if (!tools.includes(tool)) continue
-        const targetDir = join(projectDir, dir)
-        mkdirSync(targetDir, { recursive: true })
-        for (const skill of sillyspecSkills) {
-          copyDirSync(join(skillsSource, skill), join(targetDir, skill))
-        }
-        console.log(chalk.green(`    ✓ ${TOOL_LABELS[tool]} skills 已同步 (${sillyspecSkills.length} 个)`))
+      mkdirSync(claudeSkillsDir, { recursive: true });
+      for (const skill of sillyspecSkills) {
+        copyDirSync(join(skillsSource, skill), join(claudeSkillsDir, skill));
       }
+      console.log(chalk.green('    ✓ Claude Code skills 已同步 (' + sillyspecSkills.length + ' 个)'));
     }
   } else {
-    console.log(chalk.yellow('    ⚠ 未找到 skills 目录（npm 包内无 .claude/skills/），跳过同步'));
+    console.log(chalk.yellow('    ⚠ 未找到 skills 目录，跳过 Claude Code skills 同步'));
   }
 }
 
 // ── 安装完成总结 ──
 
-function showSummary(version, tools, specDir) {
+function showSummary(version, tools) {
   const toolLabels = tools.map(t => TOOL_LABELS[t] || t);
 
   console.log('');
@@ -271,7 +217,7 @@ function showSummary(version, tools, specDir) {
   console.log(chalk.green('  ═══════════════════════════════════════'));
   console.log('');
   console.log(`  已安装工具: ${chalk.cyan(toolLabels.join(', '))}`);
-  console.log(`  📁 规范目录: ${chalk.cyan(specDir || '.sillyspec')}`);
+  console.log('  📁 .sillyspec/ — 项目规范目录');
   console.log('');
   console.log('  下一步：使用 AI 技能开始工作');
   console.log('    OpenClaw:    ' + chalk.bold('/sillyspec:brainstorm'));
@@ -295,9 +241,8 @@ export function getVersion() {
 // ── 主命令 ──
 
 export async function cmdInit(projectDir, options = {}) {
-  const { tool, interactive, specDir } = options;
+  const { tool, interactive } = options;
   const version = getVersion();
-  const resolvedSpecDir = specDir ? resolve(specDir) : null;
 
   // ── 交互式模式（--interactive 或 -i）──
   if (interactive && isTTY()) {
@@ -328,7 +273,7 @@ export async function cmdInit(projectDir, options = {}) {
       validate: (answer) => answer.length > 0 || '至少选择一个工具',
     });
 
-    // 子项目引导（仅交互模式）
+    // 子项目引导（始终执行）
     let subprojects = [];
     {
       console.log('');
@@ -395,8 +340,8 @@ export async function cmdInit(projectDir, options = {}) {
     }
 
     console.log('');
-    await doInstall(projectDir, selectedTools, subprojects, resolvedSpecDir);
-    showSummary(version, selectedTools, resolvedSpecDir);
+    await doInstall(projectDir, selectedTools, subprojects);
+    showSummary(version, selectedTools);
     return;
   }
 
@@ -414,13 +359,12 @@ export async function cmdInit(projectDir, options = {}) {
     tools = detectTools(projectDir);
   }
 
-  await doInstall(projectDir, tools, [], resolvedSpecDir);
+  await doInstall(projectDir, tools);
 
   console.log('');
   console.log(chalk.green(`  ✅ SillySpec v${version} 安装完成！`));
   console.log('');
-  const specDisplay = resolvedSpecDir || '.sillyspec';
-  console.log(`  📁 规范目录: ${chalk.cyan(specDisplay)}`);
+  console.log('  📁 .sillyspec/ — 项目规范目录');
   console.log('');
   console.log('  下一步：使用 AI 技能开始工作');
   console.log(`    OpenClaw:    ${chalk.bold('/sillyspec:brainstorm')}`);

package/src/migrate.js

@@ -1,9 +1,9 @@
 import { existsSync, readdirSync, readFileSync, writeFileSync, mkdirSync, renameSync, copyFileSync } from 'fs';
-import { basename, join, resolve } from 'path';
+import { join, resolve } from 'path';
 import chalk from 'chalk';
 
 /**
- * Migrate old .sillyspec/ structure to unified .sillyspec/docs/<project>/ structure
+ * Migrate old .sillyspec/ structure to unified docs/<project>/ structure
  * @param {string} projectDir - Path to the project directory
  */
 export function migrateDocs(projectDir) {
@@ -14,7 +14,7 @@ export function migrateDocs(projectDir) {
   }
 
   // Determine project name from projects/*.yaml or directory name
-  let projectName = basename(resolve(projectDir));
+  let projectName = projectDir.split('/').pop();
   const projectsDir = join(sillyspecDir, 'projects');
   if (existsSync(projectsDir)) {
     const yamlFiles = readdirSync(projectsDir).filter(f => f.endsWith('.yaml'));
@@ -29,7 +29,7 @@ export function migrateDocs(projectDir) {
   const docsBase = join(sillyspecDir, 'docs', projectName);
   let migrated = 0;
 
-  // 1. codebase/ → .sillyspec/docs/<project>/scan/
+  // 1. codebase/ → docs/<project>/scan/
   const codebaseDir = join(sillyspecDir, 'codebase');
   if (existsSync(codebaseDir)) {
     const targetDir = join(docsBase, 'scan');
@@ -50,7 +50,7 @@ export function migrateDocs(projectDir) {
 
   // 2. specs/ is deprecated — designs live in changes/<变更名>/design.md
 
-  // 3. changes/archive/ → .sillyspec/docs/<project>/archive/
+  // 3. changes/archive/ → docs/<project>/archive/
   const archiveDir = join(sillyspecDir, 'changes', 'archive');
   if (existsSync(archiveDir)) {
     const targetDir = join(docsBase, 'archive');
@@ -69,7 +69,7 @@ export function migrateDocs(projectDir) {
     }
   }
 
-  // 4. knowledge/ → .sillyspec/docs/<project>/archive/ (append knowledge files)
+  // 4. knowledge/ → docs/<project>/archive/ (append knowledge files)
   const knowledgeDir = join(sillyspecDir, 'knowledge');
   if (existsSync(knowledgeDir)) {
     const targetDir = join(docsBase, 'archive');
@@ -88,7 +88,7 @@ export function migrateDocs(projectDir) {
     }
   }
 
-  // 5. quicklog/ → .sillyspec/docs/<project>/quicklog/
+  // 5. quicklog/ → docs/<project>/quicklog/
   const quicklogDir = join(sillyspecDir, 'quicklog');
   if (existsSync(quicklogDir)) {
     const targetDir = join(docsBase, 'quicklog');