sillyspec 3.26.10 → 3.26.13

package/src/migrate.js

@@ -1,127 +1,127 @@
-import { existsSync, readdirSync, readFileSync, writeFileSync, mkdirSync, renameSync, copyFileSync, statSync, cpSync } from 'fs';
-import { basename, join, resolve } from 'path';
-import chalk from 'chalk';
-
-/**
- * Migrate old .sillyspec/ structure to unified .sillyspec/docs/<project>/ structure
- * @param {string} projectDir - Path to the project directory
- */
-export function migrateDocs(projectDir) {
-  const sillyspecDir = join(projectDir, '.sillyspec');
-  if (!existsSync(sillyspecDir)) {
-    console.error('❌ .sillyspec/ 目录不存在');
-    process.exit(1);
-  }
-
-  // Determine project name from projects/*.yaml or directory name
-  let projectName = basename(resolve(projectDir));
-  const projectsDir = join(sillyspecDir, 'projects');
-  if (existsSync(projectsDir)) {
-    const yamlFiles = readdirSync(projectsDir).filter(f => f.endsWith('.yaml'));
-    if (yamlFiles.length > 0) {
-      projectName = yamlFiles[0].replace('.yaml', '');
-    }
-  }
-
-  console.log(chalk.cyan(`📦 迁移项目: ${projectName}`));
-  console.log('');
-
-  const docsBase = join(sillyspecDir, 'docs', projectName);
-  let migrated = 0;
-
-  // 1. codebase/ → .sillyspec/docs/<project>/scan/
-  const codebaseDir = join(sillyspecDir, 'codebase');
-  if (existsSync(codebaseDir)) {
-    const targetDir = join(docsBase, 'scan');
-    mkdirSync(targetDir, { recursive: true });
-    const files = readdirSync(codebaseDir).filter(f => f.endsWith('.md'));
-    for (const file of files) {
-      const src = join(codebaseDir, file);
-      const dest = join(targetDir, file);
-      if (!existsSync(dest)) {
-        copyFileSync(src, dest);
-        console.log(chalk.green('  ✅') + ` scan/${file}`);
-        migrated++;
-      } else {
-        console.log(chalk.yellow('  ⏭️') + ` scan/${file} (已存在)`);
-      }
-    }
-  }
-
-  // 2. specs/ is deprecated — designs live in changes/<变更名>/design.md
-
-  // 3. changes/archive/ → .sillyspec/docs/<project>/archive/
-  const archiveDir = join(sillyspecDir, 'changes', 'archive');
-  if (existsSync(archiveDir)) {
-    const targetDir = join(docsBase, 'archive');
-    mkdirSync(targetDir, { recursive: true });
-    const entries = readdirSync(archiveDir);
-    for (const entry of entries) {
-      const src = join(archiveDir, entry);
-      const dest = join(targetDir, entry);
-      if (!existsSync(dest)) {
-        // 归档变更本身是目录（含 design.md 等），copyFileSync 对目录源抛 EISDIR；
-        // 按类型分发：目录用 cpSync 递归、文件用 copyFileSync，单条失败 try/catch 不中断整体迁移
-        try {
-          if (statSync(src).isDirectory()) {
-            cpSync(src, dest, { recursive: true });
-          } else {
-            copyFileSync(src, dest);
-          }
-          console.log(chalk.green('  ✅') + ` archive/${entry}`);
-          migrated++;
-        } catch (err) {
-          console.log(chalk.yellow('  ⚠️') + ` archive/${entry} 迁移失败: ${err.message}`);
-        }
-      } else {
-        console.log(chalk.yellow('  ⏭️') + ` archive/${entry} (已存在)`);
-      }
-    }
-  }
-
-  // 4. knowledge/ → .sillyspec/docs/<project>/archive/ (append knowledge files)
-  const knowledgeDir = join(sillyspecDir, 'knowledge');
-  if (existsSync(knowledgeDir)) {
-    const targetDir = join(docsBase, 'archive');
-    mkdirSync(targetDir, { recursive: true });
-    const files = readdirSync(knowledgeDir).filter(f => f.endsWith('.md'));
-    for (const file of files) {
-      const src = join(knowledgeDir, file);
-      const dest = join(targetDir, `knowledge-${file}`);
-      if (!existsSync(dest)) {
-        copyFileSync(src, dest);
-        console.log(chalk.green('  ✅') + ` archive/knowledge-${file}`);
-        migrated++;
-      } else {
-        console.log(chalk.yellow('  ⏭️') + ` archive/knowledge-${file} (已存在)`);
-      }
-    }
-  }
-
-  // 5. quicklog/ → .sillyspec/docs/<project>/quicklog/
-  const quicklogDir = join(sillyspecDir, 'quicklog');
-  if (existsSync(quicklogDir)) {
-    const targetDir = join(docsBase, 'quicklog');
-    mkdirSync(targetDir, { recursive: true });
-    const files = readdirSync(quicklogDir).filter(f => f.endsWith('.md'));
-    for (const file of files) {
-      const src = join(quicklogDir, file);
-      const dest = join(targetDir, file);
-      if (!existsSync(dest)) {
-        copyFileSync(src, dest);
-        console.log(chalk.green('  ✅') + ` quicklog/${file}`);
-        migrated++;
-      } else {
-        console.log(chalk.yellow('  ⏭️') + ` quicklog/${file} (已存在)`);
-      }
-    }
-  }
-
-  console.log('');
-  if (migrated > 0) {
-    console.log(chalk.green(`  ✅ 迁移完成，共迁移 ${migrated} 个文件`));
-    console.log(chalk.dim('  旧文件保留在原位，确认无误后可手动删除'));
-  } else {
-    console.log(chalk.yellow('  没有需要迁移的文件'));
-  }
-}
+import { existsSync, readdirSync, readFileSync, writeFileSync, mkdirSync, renameSync, copyFileSync, statSync, cpSync } from 'fs';
+import { basename, join, resolve } from 'path';
+import chalk from 'chalk';
+
+/**
+ * Migrate old .sillyspec/ structure to unified .sillyspec/docs/<project>/ structure
+ * @param {string} projectDir - Path to the project directory
+ */
+export function migrateDocs(projectDir) {
+  const sillyspecDir = join(projectDir, '.sillyspec');
+  if (!existsSync(sillyspecDir)) {
+    console.error('❌ .sillyspec/ 目录不存在');
+    process.exit(1);
+  }
+
+  // Determine project name from projects/*.yaml or directory name
+  let projectName = basename(resolve(projectDir));
+  const projectsDir = join(sillyspecDir, 'projects');
+  if (existsSync(projectsDir)) {
+    const yamlFiles = readdirSync(projectsDir).filter(f => f.endsWith('.yaml'));
+    if (yamlFiles.length > 0) {
+      projectName = yamlFiles[0].replace('.yaml', '');
+    }
+  }
+
+  console.log(chalk.cyan(`📦 迁移项目: ${projectName}`));
+  console.log('');
+
+  const docsBase = join(sillyspecDir, 'docs', projectName);
+  let migrated = 0;
+
+  // 1. codebase/ → .sillyspec/docs/<project>/scan/
+  const codebaseDir = join(sillyspecDir, 'codebase');
+  if (existsSync(codebaseDir)) {
+    const targetDir = join(docsBase, 'scan');
+    mkdirSync(targetDir, { recursive: true });
+    const files = readdirSync(codebaseDir).filter(f => f.endsWith('.md'));
+    for (const file of files) {
+      const src = join(codebaseDir, file);
+      const dest = join(targetDir, file);
+      if (!existsSync(dest)) {
+        copyFileSync(src, dest);
+        console.log(chalk.green('  ✅') + ` scan/${file}`);
+        migrated++;
+      } else {
+        console.log(chalk.yellow('  ⏭️') + ` scan/${file} (已存在)`);
+      }
+    }
+  }
+
+  // 2. specs/ is deprecated — designs live in changes/<变更名>/design.md
+
+  // 3. changes/archive/ → .sillyspec/docs/<project>/archive/
+  const archiveDir = join(sillyspecDir, 'changes', 'archive');
+  if (existsSync(archiveDir)) {
+    const targetDir = join(docsBase, 'archive');
+    mkdirSync(targetDir, { recursive: true });
+    const entries = readdirSync(archiveDir);
+    for (const entry of entries) {
+      const src = join(archiveDir, entry);
+      const dest = join(targetDir, entry);
+      if (!existsSync(dest)) {
+        // 归档变更本身是目录（含 design.md 等），copyFileSync 对目录源抛 EISDIR；
+        // 按类型分发：目录用 cpSync 递归、文件用 copyFileSync，单条失败 try/catch 不中断整体迁移
+        try {
+          if (statSync(src).isDirectory()) {
+            cpSync(src, dest, { recursive: true });
+          } else {
+            copyFileSync(src, dest);
+          }
+          console.log(chalk.green('  ✅') + ` archive/${entry}`);
+          migrated++;
+        } catch (err) {
+          console.log(chalk.yellow('  ⚠️') + ` archive/${entry} 迁移失败: ${err.message}`);
+        }
+      } else {
+        console.log(chalk.yellow('  ⏭️') + ` archive/${entry} (已存在)`);
+      }
+    }
+  }
+
+  // 4. knowledge/ → .sillyspec/docs/<project>/archive/ (append knowledge files)
+  const knowledgeDir = join(sillyspecDir, 'knowledge');
+  if (existsSync(knowledgeDir)) {
+    const targetDir = join(docsBase, 'archive');
+    mkdirSync(targetDir, { recursive: true });
+    const files = readdirSync(knowledgeDir).filter(f => f.endsWith('.md'));
+    for (const file of files) {
+      const src = join(knowledgeDir, file);
+      const dest = join(targetDir, `knowledge-${file}`);
+      if (!existsSync(dest)) {
+        copyFileSync(src, dest);
+        console.log(chalk.green('  ✅') + ` archive/knowledge-${file}`);
+        migrated++;
+      } else {
+        console.log(chalk.yellow('  ⏭️') + ` archive/knowledge-${file} (已存在)`);
+      }
+    }
+  }
+
+  // 5. quicklog/ → .sillyspec/docs/<project>/quicklog/
+  const quicklogDir = join(sillyspecDir, 'quicklog');
+  if (existsSync(quicklogDir)) {
+    const targetDir = join(docsBase, 'quicklog');
+    mkdirSync(targetDir, { recursive: true });
+    const files = readdirSync(quicklogDir).filter(f => f.endsWith('.md'));
+    for (const file of files) {
+      const src = join(quicklogDir, file);
+      const dest = join(targetDir, file);
+      if (!existsSync(dest)) {
+        copyFileSync(src, dest);
+        console.log(chalk.green('  ✅') + ` quicklog/${file}`);
+        migrated++;
+      } else {
+        console.log(chalk.yellow('  ⏭️') + ` quicklog/${file} (已存在)`);
+      }
+    }
+  }
+
+  console.log('');
+  if (migrated > 0) {
+    console.log(chalk.green(`  ✅ 迁移完成，共迁移 ${migrated} 个文件`));
+    console.log(chalk.dim('  旧文件保留在原位，确认无误后可手动删除'));
+  } else {
+    console.log(chalk.yellow('  没有需要迁移的文件'));
+  }
+}

package/src/modules.js

@@ -1,6 +1,7 @@
 import { existsSync, readdirSync, readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
-import { DB } from './db.js';
+import { gitQuiet } from './git-helper.js';
+
 
 /**
  * 查找项目下的 _module-map.yaml 路径
@@ -114,8 +115,8 @@ export async function rebuildModuleMap(cwd, { force = false } = {}) {
   const now = new Date().toISOString().replace('T', ' ').slice(0, 19);
   let headCommit = '';
   try {
-    const { execSync } = await import('child_process');
-    headCommit = execSync('git rev-parse --short HEAD', { cwd, encoding: 'utf8', timeout: 5000 }).trim();
+    // QUAL-01 收口：走 git-helper 统一入口（safe.directory + 数组形式）
+    headCommit = gitQuiet(cwd, ['rev-parse', '--short', 'HEAD']) || '';
   } catch { /* ignore */ }
 
   let yaml = `schema_version: 2\n`;
@@ -193,8 +194,9 @@ export async function showModuleStatus(cwd) {
 
   const content = readFileSync(mapPath, 'utf8');
 
-  // 简单解析
-  const lines = content.split('\n');
+  // 简单解析（CRLF 兼容：坑 verify-modules-crlf-blanket-fallback 同类——`$` 锚定正则在
+  // Windows 编辑器写出的 CRLF 文件上模块条目全失配，模块数恒显示 0）
+  const lines = content.split(/\r?\n/);
   const modules = [];
   let currentModule = null;
   let needsReview = false;