autosnippet 3.0.1 → 3.0.3

package/lib/cli/UpgradeService.js

@@ -2,7 +2,7 @@
  * UpgradeService — IDE 集成升级服务
  *
  * 当 AutoSnippet 发布新版本后，老用户执行 `asd upgrade` 即可更新：
- *   ① MCP 配置（.cursor/mcp.json + .vscode/settings.json）
+ *   ① MCP 配置（.cursor/mcp.json + .vscode/mcp.json）
  *   ② Cursor Skills（.cursor/skills/）
  *   ③ Cursor Rules（.cursor/rules/autosnippet-conventions.mdc + autosnippet-skills.mdc）
  *   ④ Copilot Instructions（.github/copilot-instructions.md）
@@ -13,15 +13,20 @@
  * 不会重建数据库、子仓库或运行时目录。
  */
 
+import { execSync } from 'node:child_process';
 import {
-  existsSync, mkdirSync, readFileSync, writeFileSync, copyFileSync, readdirSync,
-} from 'fs';
-import { join, resolve, dirname } from 'path';
-import { fileURLToPath } from 'url';
-import { execSync } from 'child_process';
+  copyFileSync,
+  existsSync,
+  mkdirSync,
+  readdirSync,
+  readFileSync,
+  writeFileSync,
+} from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
 
 const __filename = fileURLToPath(import.meta.url);
-const __dirname  = dirname(__filename);
+const __dirname = dirname(__filename);
 
 const REPO_ROOT = resolve(__dirname, '..', '..');
 
@@ -52,21 +57,12 @@ export class UpgradeService {
       results.push(this._ensureSkillsDir());
     }
 
-    console.log('');
-    console.log('════════════════════════════════════════');
-    console.log('✅ 升级完成');
-    console.log('════════════════════════════════════════');
-    console.log('');
-    console.log('📌 请在 Cursor / VSCode / Qoder 中 Reload Window 使更新生效');
-    console.log('');
-
     return results;
   }
 
   /* ═══ MCP 配置 ══════════════════════════════════════ */
 
   _upgradeMCP() {
-    console.log('[MCP] 更新 IDE MCP 配置...');
     const mcpServerPath = join(REPO_ROOT, 'bin', 'mcp-server.js');
     const nodePath = join(REPO_ROOT, 'node_modules');
 
@@ -79,15 +75,20 @@ export class UpgradeService {
   _updateCursorMCP(mcpServerPath, nodePath) {
     const configPath = join(this.projectRoot, '.cursor', 'mcp.json');
     if (!existsSync(configPath)) {
-      console.log('   ⚠️  .cursor/mcp.json 不存在，跳过（请先运行 asd setup）');
       return;
     }
 
     let config = {};
-    try { config = JSON.parse(readFileSync(configPath, 'utf8')); } catch { /* */ }
-    if (!config.mcpServers) config.mcpServers = {};
+    try {
+      config = JSON.parse(readFileSync(configPath, 'utf8'));
+    } catch {
+      /* */
+    }
+    if (!config.mcpServers) {
+      config.mcpServers = {};
+    }
 
-    config.mcpServers['autosnippet'] = {
+    config.mcpServers.autosnippet = {
       command: 'node',
       args: [mcpServerPath],
       env: {
@@ -97,23 +98,26 @@ export class UpgradeService {
     };
 
     writeFileSync(configPath, JSON.stringify(config, null, 2));
-    console.log('   ✅ .cursor/mcp.json');
   }
 
   _updateVSCodeMCP(mcpServerPath, nodePath) {
-    const settingsPath = join(this.projectRoot, '.vscode', 'settings.json');
-    if (!existsSync(settingsPath)) {
-      console.log('   ℹ️  .vscode/settings.json 不存在，跳过');
-      return;
-    }
+    const vscodeDir = join(this.projectRoot, '.vscode');
+    const mcpConfigPath = join(vscodeDir, 'mcp.json');
 
-    let settings = {};
-    try { settings = JSON.parse(readFileSync(settingsPath, 'utf8')); } catch { /* */ }
+    let config = {};
+    if (existsSync(mcpConfigPath)) {
+      try {
+        config = JSON.parse(readFileSync(mcpConfigPath, 'utf8'));
+      } catch {
+        /* */
+      }
+    }
 
-    if (!settings['github.copilot.mcp']) settings['github.copilot.mcp'] = {};
-    if (!settings['github.copilot.mcp'].servers) settings['github.copilot.mcp'].servers = {};
+    if (!config.servers) {
+      config.servers = {};
+    }
 
-    settings['github.copilot.mcp'].servers['autosnippet'] = {
+    config.servers.autosnippet = {
       type: 'stdio',
       command: 'node',
       args: [mcpServerPath],
@@ -123,18 +127,15 @@ export class UpgradeService {
       },
     };
 
-    writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
-    console.log('   ✅ .vscode/settings.json');
+    mkdirSync(vscodeDir, { recursive: true });
+    writeFileSync(mcpConfigPath, JSON.stringify(config, null, 2));
   }
 
   /* ═══ Skills ════════════════════════════════════════ */
 
   _upgradeSkills() {
-    console.log('[Skills] 重新安装 Cursor Skills...');
-
     const installScript = join(REPO_ROOT, 'scripts', 'install-cursor-skill.js');
     if (!existsSync(installScript)) {
-      console.log('   ⚠️  install-cursor-skill.js 不存在，跳过');
       return;
     }
 
@@ -152,11 +153,8 @@ export class UpgradeService {
   /* ═══ Cursor Rules ══════════════════════════════════ */
 
   _upgradeCursorRules() {
-    console.log('[Rules] 更新 Cursor Rules...');
-
     const src = join(REPO_ROOT, 'templates', 'cursor-rules', 'autosnippet-conventions.mdc');
     if (!existsSync(src)) {
-      console.log('   ⚠️  模板不存在，跳过');
       return;
     }
 
@@ -164,7 +162,6 @@ export class UpgradeService {
     const dest = join(destDir, 'autosnippet-conventions.mdc');
     mkdirSync(destDir, { recursive: true });
     copyFileSync(src, dest);
-    console.log('   ✅ .cursor/rules/autosnippet-conventions.mdc');
 
     // 动态生成 4 通道交付物料（如 ServiceContainer 已初始化）
     this._triggerCursorDelivery();
@@ -180,15 +177,10 @@ export class UpgradeService {
         const container = getServiceContainer();
         if (container.services.cursorDeliveryPipeline) {
           const pipeline = container.get('cursorDeliveryPipeline');
-          pipeline.deliver()
-            .then(result => {
-              console.log(`   ✅ Cursor Delivery: ${result.channelA.rulesCount} rules, ` +
-                `${result.channelB.topicCount} topics, ${result.channelC.synced} skills, ` +
-                `${result.channelD?.documentsCount || 0} documents`);
-            })
-            .catch(err => {
-              console.log(`   ⚠️  Cursor Delivery 跳过: ${err.message}`);
-            });
+          pipeline
+            .deliver()
+            .then((_result) => {})
+            .catch((_err) => {});
         }
       })
       .catch(() => {
@@ -204,13 +196,11 @@ export class UpgradeService {
    * @param {string} targetDirName - '.qoder' 或 '.trae'
    */
   _upgradeMirrorIDE(targetDirName) {
-    const label = targetDirName.replace('.', '').charAt(0).toUpperCase() + targetDirName.slice(2);
-    console.log(`[${label}] 更新 ${label} Rules...`);
+    const _label = targetDirName.replace('.', '').charAt(0).toUpperCase() + targetDirName.slice(2);
 
     // 镜像 .cursor/rules/ 中的 autosnippet-* 文件
     const cursorRulesDir = join(this.projectRoot, '.cursor', 'rules');
     if (!existsSync(cursorRulesDir)) {
-      console.log('   ⚠️  .cursor/rules/ 不存在，跳过');
       return;
     }
 
@@ -218,29 +208,28 @@ export class UpgradeService {
     mkdirSync(targetRulesDir, { recursive: true });
 
     // 只复制 autosnippet- 前缀的文件，不触碰用户自己创建的规则
-    const files = readdirSync(cursorRulesDir).filter(f =>
-      (f.endsWith('.mdc') || f.endsWith('.md')) && f.startsWith('autosnippet-')
+    const files = readdirSync(cursorRulesDir).filter(
+      (f) => (f.endsWith('.mdc') || f.endsWith('.md')) && f.startsWith('autosnippet-')
     );
     for (const file of files) {
       const destName = file.endsWith('.mdc') ? file.replace(/\.mdc$/, '.md') : file;
       copyFileSync(join(cursorRulesDir, file), join(targetRulesDir, destName));
     }
-    console.log(`   ✅ ${targetDirName}/rules/ (镜像 ${files.length} 个 autosnippet 规则文件)`);
 
     // 镜像 .cursor/skills/ 中的 autosnippet-* 技能目录
     const cursorSkillsDir = join(this.projectRoot, '.cursor', 'skills');
     if (existsSync(cursorSkillsDir)) {
       const targetSkillsDir = join(this.projectRoot, targetDirName, 'skills');
       mkdirSync(targetSkillsDir, { recursive: true });
-      const skillDirs = readdirSync(cursorSkillsDir, { withFileTypes: true })
-        .filter(d => d.isDirectory() && d.name.startsWith('autosnippet-'));
+      const skillDirs = readdirSync(cursorSkillsDir, { withFileTypes: true }).filter(
+        (d) => d.isDirectory() && d.name.startsWith('autosnippet-')
+      );
       for (const dir of skillDirs) {
         this._copyDirRecursiveSkill(
           join(cursorSkillsDir, dir.name),
           join(targetSkillsDir, dir.name)
         );
       }
-      console.log(`   ✅ ${targetDirName}/skills/ (镜像 ${skillDirs.length} 个 autosnippet 技能)`);
     }
   }
 
@@ -261,11 +250,8 @@ export class UpgradeService {
   /* ═══ Copilot Instructions ══════════════════════════ */
 
   _upgradeCopilotInstructions() {
-    console.log('[Instructions] 更新 Copilot Instructions...');
-
     const src = join(REPO_ROOT, 'templates', 'copilot-instructions.md');
     if (!existsSync(src)) {
-      console.log('   ⚠️  模板不存在，跳过');
       return;
     }
 
@@ -273,24 +259,19 @@ export class UpgradeService {
     const dest = join(destDir, 'copilot-instructions.md');
     mkdirSync(destDir, { recursive: true });
     copyFileSync(src, dest);
-    console.log('   ✅ .github/copilot-instructions.md');
   }
 
   /* ═══ Constitution ══════════════════════════════════ */
 
   _upgradeConstitution() {
-    console.log('[Constitution] 更新权限宪法...');
-
     const src = join(REPO_ROOT, 'templates', 'constitution.yaml');
     if (!existsSync(src)) {
-      console.log('   ⚠️  模板不存在，跳过');
       return;
     }
 
     // 子仓库路径：AutoSnippet/constitution.yaml
     const dest = join(this.projectRoot, 'AutoSnippet', 'constitution.yaml');
     if (!existsSync(join(this.projectRoot, 'AutoSnippet'))) {
-      console.log('   ⚠️  AutoSnippet/ 目录不存在，跳过（请先运行 asd setup）');
       return;
     }
 
@@ -299,32 +280,24 @@ export class UpgradeService {
       const oldContent = readFileSync(dest, 'utf8');
       const newContent = readFileSync(src, 'utf8');
       if (oldContent === newContent) {
-        console.log('   ℹ️  constitution.yaml 已是最新版本');
         return;
       }
-      const backupPath = dest + '.bak';
+      const backupPath = `${dest}.bak`;
       copyFileSync(dest, backupPath);
-      console.log(`   📦 已备份旧版本 → constitution.yaml.bak`);
     }
 
     copyFileSync(src, dest);
-    console.log('   ✅ AutoSnippet/constitution.yaml');
 
     // 如果子仓库是 git 仓库，提示用户提交
     const gitDir = join(this.projectRoot, 'AutoSnippet', '.git');
     if (existsSync(gitDir)) {
-      console.log('   💡 子仓库已更新，请手动提交并推送：');
-      console.log('      cd AutoSnippet && git add constitution.yaml && git commit -m "Upgrade constitution" && git push');
     }
   }
   /* ═══ Skills Template ════════════════════════════════ */
 
   _upgradeSkillsTemplate() {
-    console.log('[Skills Template] 更新 autosnippet-skills.mdc...');
-
     const src = join(REPO_ROOT, 'templates', 'cursor-rules', 'autosnippet-skills.mdc');
     if (!existsSync(src)) {
-      console.log('   ⚠️  模板不存在，跳过');
       return;
     }
 
@@ -332,17 +305,13 @@ export class UpgradeService {
     const dest = join(destDir, 'autosnippet-skills.mdc');
     mkdirSync(destDir, { recursive: true });
     copyFileSync(src, dest);
-    console.log('   ✅ .cursor/rules/autosnippet-skills.mdc');
   }
 
   /* ═══ .gitignore ════════════════════════════════════ */
 
   _upgradeGitignore() {
-    console.log('[Gitignore] 更新 .gitignore 规则...');
-
     const giPath = join(this.projectRoot, '.gitignore');
     if (!existsSync(giPath)) {
-      console.log('   ℹ️  .gitignore 不存在，跳过');
       return;
     }
 
@@ -353,28 +322,24 @@ export class UpgradeService {
     if (content.includes('.autosnippet/') && !content.includes('.autosnippet/*')) {
       content = content.replace(/^\.autosnippet\/$/m, '.autosnippet/*');
       changed = true;
-      console.log('   ✅ .autosnippet/ → .autosnippet/*（升级为精细忽略）');
     }
 
     // 确保有 .autosnippet/*
     if (!content.includes('.autosnippet/') && !content.includes('.autosnippet/*')) {
       content += `\n# AutoSnippet 运行时缓存（不入库）\n.autosnippet/*\n`;
       changed = true;
-      console.log('   ✅ += .autosnippet/*');
     }
 
     // 确保 config.json 跟踪
     if (!content.includes('!.autosnippet/config.json')) {
       content += `!.autosnippet/config.json\n`;
       changed = true;
-      console.log('   ✅ += !.autosnippet/config.json');
     }
 
     // 清理旧版本的 .autosnippet/skills/ negation（已迁移到 AutoSnippet/skills/）
     if (content.includes('!.autosnippet/skills/')) {
       content = content.replace(/^!?\.autosnippet\/skills\/.*\n?/gm, '');
       changed = true;
-      console.log('   ✅ 移除旧版 .autosnippet/skills/ 规则（已迁移到 AutoSnippet/skills/）');
     }
 
     // ── v2.8.1: 新增缺失的 gitignore 规则 ──
@@ -383,68 +348,61 @@ export class UpgradeService {
     if (!content.includes('_draft_*.md')) {
       content += `\n# AutoSnippet AI 草稿文件（项目根目录临时文件）\n_draft_*.md\n`;
       changed = true;
-      console.log('   ✅ += _draft_*.md');
     }
 
     // .DS_Store — macOS 元数据
     if (!content.includes('.DS_Store')) {
       content += `\n# macOS 元数据\n.DS_Store\n`;
       changed = true;
-      console.log('   ✅ += .DS_Store');
     }
 
     // nohup.out — 后台进程输出
     if (!content.includes('nohup.out')) {
       content += `nohup.out\n`;
       changed = true;
-      console.log('   ✅ += nohup.out');
     }
 
     // *.sw[a-p] — vim swap 文件
     if (!content.match(/\*\.sw\[a-p\]/)) {
       content += `*.sw[a-p]\n`;
       changed = true;
-      console.log('   ✅ += *.sw[a-p]');
     }
 
     // .autosnippet-drafts/ — AI 草稿目录
     if (!content.includes('.autosnippet-drafts')) {
       content += `\n# AutoSnippet AI 草稿（临时）\n.autosnippet-drafts/\n`;
       changed = true;
-      console.log('   ✅ += .autosnippet-drafts/');
     }
 
     // .env — 环境变量
     if (!content.includes('.env') || (!content.match(/^\.env$/m) && !content.match(/^\.env\s/m))) {
       content += `\n# AutoSnippet 环境变量（含 API Key，不入库）\n.env\n`;
       changed = true;
-      console.log('   ✅ += .env');
     }
 
     // logs/ — 运行日志
     if (!content.match(/^logs\/?$/m)) {
       content += `\n# AutoSnippet 运行日志\nlogs/\n`;
       changed = true;
-      console.log('   ✅ += logs/');
     }
 
     // 确保 AutoSnippet/ 不被忽略
     const lines = content.split('\n');
-    const hasIgnoreAS = lines.some(l => {
+    const hasIgnoreAS = lines.some((l) => {
       const t = l.trim();
-      return (t === 'AutoSnippet/' || t === 'AutoSnippet') && !t.startsWith('#') && !t.startsWith('!');
+      return (
+        (t === 'AutoSnippet/' || t === 'AutoSnippet') && !t.startsWith('#') && !t.startsWith('!')
+      );
     });
-    const hasNegation = lines.some(l => l.trim() === '!AutoSnippet/');
+    const hasNegation = lines.some((l) => l.trim() === '!AutoSnippet/');
     if (hasIgnoreAS && !hasNegation) {
       content += `\n# AutoSnippet 知识库必须入库（取消上方忽略）\n!AutoSnippet/\n`;
       changed = true;
-      console.log('   ✅ += !AutoSnippet/ (取消忽略)');
     }
 
     if (changed) {
       writeFileSync(giPath, content);
     } else {
-      console.log('   ℹ️  .gitignore 已是最新版本');
     }
   }
 
@@ -454,10 +412,12 @@ export class UpgradeService {
     const oldSkillsDir = join(this.projectRoot, '.autosnippet', 'skills');
     const newSkillsDir = join(this.projectRoot, 'AutoSnippet', 'skills');
 
-    if (!existsSync(oldSkillsDir)) return;
-    if (!existsSync(join(this.projectRoot, 'AutoSnippet'))) return;
-
-    console.log('[Migration] 迁移 Skills: .autosnippet/skills/ → AutoSnippet/skills/...');
+    if (!existsSync(oldSkillsDir)) {
+      return;
+    }
+    if (!existsSync(join(this.projectRoot, 'AutoSnippet'))) {
+      return;
+    }
 
     try {
       mkdirSync(newSkillsDir, { recursive: true });
@@ -465,11 +425,12 @@ export class UpgradeService {
       let migrated = 0;
 
       for (const entry of entries) {
-        if (!entry.isDirectory()) continue;
+        if (!entry.isDirectory()) {
+          continue;
+        }
         const src = join(oldSkillsDir, entry.name);
         const dest = join(newSkillsDir, entry.name);
         if (existsSync(dest)) {
-          console.log(`   ℹ️  ${entry.name} 已存在于新路径，跳过`);
           continue;
         }
         // 复制目录
@@ -478,10 +439,7 @@ export class UpgradeService {
       }
 
       if (migrated > 0) {
-        console.log(`   ✅ 已迁移 ${migrated} 个 Skill 到 AutoSnippet/skills/`);
-        console.log('   💡 确认迁移无误后可删除旧目录: rm -rf .autosnippet/skills/');
       } else {
-        console.log('   ℹ️  无需迁移（所有 Skill 已存在于新路径）');
       }
     } catch (e) {
       console.error(`   ❌ 迁移失败: ${e.message}`);
@@ -492,11 +450,14 @@ export class UpgradeService {
 
   _ensureSkillsDir() {
     const skillsDir = join(this.projectRoot, 'AutoSnippet', 'skills');
-    if (!existsSync(join(this.projectRoot, 'AutoSnippet'))) return;
-    if (existsSync(skillsDir)) return;
+    if (!existsSync(join(this.projectRoot, 'AutoSnippet'))) {
+      return;
+    }
+    if (existsSync(skillsDir)) {
+      return;
+    }
 
     mkdirSync(skillsDir, { recursive: true });
-    console.log('[Skills] ✅ 创建 AutoSnippet/skills/ 目录');
   }
 }