autosnippet 3.0.1 → 3.0.2

package/lib/{service/automation → platform/ios/xcode}/XcodeIntegration.js

@@ -13,8 +13,8 @@
  *   §9  完整插入流程   — cut 触发行 → preflight → headers → offset → paste
  */
 
-import { readFileSync, writeFileSync, existsSync, readdirSync, statSync } from 'node:fs';
-import { basename, dirname, relative, resolve as pathResolve, sep } from 'node:path';
+import { existsSync, readdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
+import { basename, dirname, resolve as pathResolve, relative, sep } from 'node:path';
 import { saveEventFilter } from './SaveEventFilter.js';
 
 // ═══════════════════════════════════════════════════════════════
@@ -22,16 +22,20 @@ import { saveEventFilter } from './SaveEventFilter.js';
 // ═══════════════════════════════════════════════════════════════
 
 function _sleep(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms));
+  return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
 /**
  * 在 import 行末尾附加来源标记注释
  */
 function _withAutoSnippetNote(importLine) {
-  if (!importLine) return importLine;
+  if (!importLine) {
+    return importLine;
+  }
   const note = '// AutoSnippet: 自动插入';
-  if (importLine.includes(note)) return importLine;
+  if (importLine.includes(note)) {
+    return importLine;
+  }
   return `${importLine} ${note}`;
 }
 
@@ -49,19 +53,30 @@ function _parseHeaderString(header) {
   const t = header.trim();
   // #import <Module/Header.h>
   let m = t.match(/^#(?:import|include)\s+<([^/> ]+)\/([^>]+)>/);
-  if (m) return { moduleName: m[1], headerName: m[2], isAngle: true };
+  if (m) {
+    return { moduleName: m[1], headerName: m[2], isAngle: true };
+  }
   // #import <Module>  (framework umbrella)
   m = t.match(/^#(?:import|include)\s+<([^>]+)>/);
-  if (m) return { moduleName: m[1], headerName: '', isAngle: true };
+  if (m) {
+    return { moduleName: m[1], headerName: '', isAngle: true };
+  }
   // #import "Header.h" or #import "Dir/Header.h"
   m = t.match(/^#(?:import|include)\s+"([^"]+)"/);
   if (m) {
     const parts = m[1].split('/');
-    return { moduleName: '', headerName: parts[parts.length - 1], isAngle: false, quotedPath: m[1] };
+    return {
+      moduleName: '',
+      headerName: parts[parts.length - 1],
+      isAngle: false,
+      quotedPath: m[1],
+    };
   }
   // @import Module;
   m = t.match(/^@import\s+(\w+)/);
-  if (m) return { moduleName: m[1], headerName: '', isAngle: false, isAtImport: true };
+  if (m) {
+    return { moduleName: m[1], headerName: '', isAngle: false, isAtImport: true };
+  }
   // import Module (Swift)
   m = t.match(/^import\s+(\w+)/);
   if (m && !['class', 'struct', 'enum', 'protocol', 'func', 'var', 'let'].includes(m[1])) {
@@ -88,19 +103,25 @@ function _parseHeaderString(header) {
  * @returns {string|null} 相对路径 (如 "Foo.h" 或 "../SubDir/Foo.h")，null 表示未找到
  */
 function _findHeaderRelativePath(headerName, currentFilePath, projectRoot) {
-  if (!headerName || !currentFilePath) return null;
+  if (!headerName || !currentFilePath) {
+    return null;
+  }
   try {
     const currentDir = dirname(currentFilePath);
 
     // 1. 同目录检查
     const sameDir = pathResolve(currentDir, headerName);
-    if (existsSync(sameDir)) return headerName;
+    if (existsSync(sameDir)) {
+      return headerName;
+    }
 
     // 2. 向上找 Sources/ 或 target 根目录，在其下递归搜索
     const searchRoots = [];
     if (projectRoot) {
       const sourcesDir = pathResolve(projectRoot, 'Sources');
-      if (existsSync(sourcesDir)) searchRoots.push(sourcesDir);
+      if (existsSync(sourcesDir)) {
+        searchRoots.push(sourcesDir);
+      }
       searchRoots.push(projectRoot);
     }
     // 也从当前文件向上找 Sources 目录
@@ -112,7 +133,9 @@ function _findHeaderRelativePath(headerName, currentFilePath, projectRoot) {
         break;
       }
       const parent = dirname(dir);
-      if (parent === dir) break;
+      if (parent === dir) {
+        break;
+      }
       dir = parent;
     }
 
@@ -137,25 +160,37 @@ function _findHeaderRelativePath(headerName, currentFilePath, projectRoot) {
  * 递归查找文件（限最大深度）
  */
 function _findFileRecursive(dir, fileName, maxDepth) {
-  if (maxDepth <= 0) return null;
+  if (maxDepth <= 0) {
+    return null;
+  }
   try {
     const entries = readdirSync(dir);
     // 先在当前层查找
     for (const e of entries) {
-      if (e === fileName) return pathResolve(dir, e);
+      if (e === fileName) {
+        return pathResolve(dir, e);
+      }
     }
     // 再递归子目录（跳过隐藏目录和常见无关目录）
     for (const e of entries) {
-      if (e.startsWith('.') || e === 'node_modules' || e === 'build' || e === 'DerivedData') continue;
+      if (e.startsWith('.') || e === 'node_modules' || e === 'build' || e === 'DerivedData') {
+        continue;
+      }
       const full = pathResolve(dir, e);
       try {
         if (statSync(full).isDirectory()) {
           const found = _findFileRecursive(full, fileName, maxDepth - 1);
-          if (found) return found;
+          if (found) {
+            return found;
+          }
         }
-      } catch { /* 跳过不可访问的目录 */ }
+      } catch {
+        /* 跳过不可访问的目录 */
+      }
     }
-  } catch { /* 跳过不可读目录 */ }
+  } catch {
+    /* 跳过不可读目录 */
+  }
   return null;
 }
 
@@ -184,24 +219,34 @@ function _resolveHeaderFormat(rawHeader, ctx) {
   // Swift: 始终 `import Module`
   if (isSwift || parsed.isSwiftImport) {
     // 已经是完整 swift import 语句
-    if (parsed.isSwiftImport) return rawHeader.trim();
+    if (parsed.isSwiftImport) {
+      return rawHeader.trim();
+    }
     // 从 ObjC 格式推断 swift import
     const mod = parsed.moduleName || headerModuleName || '';
-    if (mod) return `import ${mod}`;
+    if (mod) {
+      return `import ${mod}`;
+    }
     return rawHeader.trim(); // 无法推断，原样返回
   }
 
   // @import 保持原样（模块级引用不受 target 影响）
-  if (parsed.isAtImport) return rawHeader.trim();
+  if (parsed.isAtImport) {
+    return rawHeader.trim();
+  }
 
   // 已经是尖括号格式 → 保持（明确的跨模块引用）
-  if (parsed.isAngle) return rawHeader.trim();
+  if (parsed.isAngle) {
+    return rawHeader.trim();
+  }
 
   // ── ObjC: 判断同 target vs 跨 target ──
   const effectiveModule = parsed.moduleName || headerModuleName || '';
 
   // 如果没有 target 信息，无法判断，保持原样
-  if (!currentTarget || !effectiveModule) return rawHeader.trim();
+  if (!currentTarget || !effectiveModule) {
+    return rawHeader.trim();
+  }
 
   const isSameTarget = currentTarget === effectiveModule;
 
@@ -209,10 +254,16 @@ function _resolveHeaderFormat(rawHeader, ctx) {
     // 同 target → 引号格式，计算相对路径
     if (parsed.headerName && fullPath) {
       const relPath = _findHeaderRelativePath(parsed.headerName, fullPath, projectRoot);
-      if (relPath) return `#import "${relPath}"`;
+      if (relPath) {
+        return `#import "${relPath}"`;
+      }
+    }
+    if (parsed.quotedPath) {
+      return `#import "${parsed.quotedPath}"`;
+    }
+    if (parsed.headerName) {
+      return `#import "${parsed.headerName}"`;
     }
-    if (parsed.quotedPath) return `#import "${parsed.quotedPath}"`;
-    if (parsed.headerName) return `#import "${parsed.headerName}"`;
     return rawHeader.trim();
   }
 
@@ -226,16 +277,56 @@ function _resolveHeaderFormat(rawHeader, ctx) {
 
 /** 常见 Apple 系统框架（无需 SPM 依赖检查） */
 const _SYSTEM_FRAMEWORKS = new Set([
-  'Foundation', 'UIKit', 'AppKit', 'SwiftUI', 'Combine', 'CoreFoundation',
-  'CoreGraphics', 'CoreData', 'CoreAnimation', 'CoreLocation', 'CoreMedia',
-  'CoreImage', 'CoreText', 'CoreVideo', 'QuartzCore', 'AVFoundation',
-  'AVKit', 'WebKit', 'MapKit', 'Metal', 'MetalKit', 'ARKit', 'SceneKit',
-  'SpriteKit', 'GameKit', 'GameplayKit', 'HealthKit', 'HomeKit', 'CloudKit',
-  'StoreKit', 'PhotosUI', 'Photos', 'Contacts', 'ContactsUI', 'EventKit',
-  'UserNotifications', 'MessageUI', 'MultipeerConnectivity', 'NetworkExtension',
-  'SafariServices', 'AuthenticationServices', 'LocalAuthentication',
-  'Security', 'CryptoKit', 'Accelerate', 'os', 'Darwin', 'ObjectiveC',
-  'Dispatch', 'XCTest',
+  'Foundation',
+  'UIKit',
+  'AppKit',
+  'SwiftUI',
+  'Combine',
+  'CoreFoundation',
+  'CoreGraphics',
+  'CoreData',
+  'CoreAnimation',
+  'CoreLocation',
+  'CoreMedia',
+  'CoreImage',
+  'CoreText',
+  'CoreVideo',
+  'QuartzCore',
+  'AVFoundation',
+  'AVKit',
+  'WebKit',
+  'MapKit',
+  'Metal',
+  'MetalKit',
+  'ARKit',
+  'SceneKit',
+  'SpriteKit',
+  'GameKit',
+  'GameplayKit',
+  'HealthKit',
+  'HomeKit',
+  'CloudKit',
+  'StoreKit',
+  'PhotosUI',
+  'Photos',
+  'Contacts',
+  'ContactsUI',
+  'EventKit',
+  'UserNotifications',
+  'MessageUI',
+  'MultipeerConnectivity',
+  'NetworkExtension',
+  'SafariServices',
+  'AuthenticationServices',
+  'LocalAuthentication',
+  'Security',
+  'CryptoKit',
+  'Accelerate',
+  'os',
+  'Darwin',
+  'ObjectiveC',
+  'Dispatch',
+  'XCTest',
 ]);
 
 // ═══════════════════════════════════════════════════════════════
@@ -247,14 +338,18 @@ const _SYSTEM_FRAMEWORKS = new Set([
  */
 function _collectImportsFromFile(filePath, isSwift) {
   try {
-    if (!existsSync(filePath)) return [];
+    if (!existsSync(filePath)) {
+      return [];
+    }
     const content = readFileSync(filePath, 'utf8');
     const lines = content.split(/\r?\n/);
     const imports = [];
     for (const line of lines) {
       const t = line.trim();
       if (isSwift) {
-        if (t.startsWith('import ')) imports.push(t);
+        if (t.startsWith('import ')) {
+          imports.push(t);
+        }
       } else {
         if (t.startsWith('#import ') || t.startsWith('@import ') || t.startsWith('#include ')) {
           imports.push(t);
@@ -272,11 +367,15 @@ function _collectImportsFromFile(filePath, isSwift) {
  */
 function _collectImportsFromHeaderFile(sourcePath, importArray) {
   const dotIndex = sourcePath.lastIndexOf('.');
-  if (dotIndex <= 0) return;
-  const headerPath = sourcePath.substring(0, dotIndex) + '.h';
+  if (dotIndex <= 0) {
+    return;
+  }
+  const headerPath = `${sourcePath.substring(0, dotIndex)}.h`;
   const importReg = /^#import\s*<[A-Za-z0-9_]+\/[A-Za-z0-9_+.-]+\.h>$/;
   try {
-    if (!existsSync(headerPath)) return;
+    if (!existsSync(headerPath)) {
+      return;
+    }
     const data = readFileSync(headerPath, 'utf8');
     for (const line of data.split('\n')) {
       const t = line.trim();
@@ -284,7 +383,9 @@ function _collectImportsFromHeaderFile(sourcePath, importArray) {
         importArray.push(t);
       }
     }
-  } catch { /* ignore */ }
+  } catch {
+    /* ignore */
+  }
 }
 
 /**
@@ -307,7 +408,9 @@ function _checkImportStatus(importArray, headerLine, isSwift) {
 
   if (isSwift) {
     const m = trimmed.match(/^import\s+(\w+)/);
-    if (m) moduleName = m[1];
+    if (m) {
+      moduleName = m[1];
+    }
     headerFileName = moduleName;
   } else {
     const angle = trimmed.match(/<([^/]+)\/([^>]+)>/);
@@ -359,9 +462,13 @@ function _checkImportStatus(importArray, headerLine, isSwift) {
       if (headerFileNameLower) {
         let importedFileName = null;
         const a = impT.match(/<[^/]+\/([^>]+)>/);
-        if (a) importedFileName = a[1].toLowerCase();
+        if (a) {
+          importedFileName = a[1].toLowerCase();
+        }
         const q = impT.match(/"([^"]+)"/);
-        if (q) importedFileName = basename(q[1]).toLowerCase();
+        if (q) {
+          importedFileName = basename(q[1]).toLowerCase();
+        }
         if (importedFileName && importedFileName === headerFileNameLower) {
           return { hasHeader: false, hasModule: false, hasSimilarHeader: true };
         }
@@ -390,9 +497,15 @@ function _inferModulesFromHeaders(headers) {
     const t = h.trim();
     let m;
     m = t.match(/^#import\s+<([^/> ]+)/);
-    if (m) { modules.add(m[1]); continue; }
+    if (m) {
+      modules.add(m[1]);
+      continue;
+    }
     m = t.match(/^@import\s+(\w+)/);
-    if (m) { modules.add(m[1]); continue; }
+    if (m) {
+      modules.add(m[1]);
+      continue;
+    }
     m = t.match(/^import\s+(\w+)/);
     if (m && !['class', 'struct', 'enum', 'protocol'].includes(m[1])) {
       modules.add(m[1]);
@@ -412,7 +525,9 @@ function _inferModulesFromHeaders(headers) {
  *   review   — 依赖缺失但可添加，需用户确认
  */
 function _evaluateDepResult(ensureResult, from, to) {
-  if (ensureResult.exists) return { action: 'continue' };
+  if (ensureResult.exists) {
+    return { action: 'continue' };
+  }
   if (!ensureResult.canAdd) {
     return { action: 'block', reason: ensureResult.reason || 'cycleBlocked', from, to };
   }
@@ -429,33 +544,34 @@ function _handleDepReview(ctx) {
   const { spmService, currentTarget, mod, ensureResult, NU, depWarnings, label = '' } = ctx;
 
   const fixMode = spmService.getFixMode();
-  const buttons = fixMode === 'fix'
-    ? ['直接插入（信任架构）', '提示操作插入', '自动修复依赖', '取消操作']
-    : ['直接插入（信任架构）', '提示操作插入', '取消操作'];
+  const buttons =
+    fixMode === 'fix'
+      ? ['直接插入（信任架构）', '提示操作插入', '自动修复依赖', '取消操作']
+      : ['直接插入（信任架构）', '提示操作插入', '取消操作'];
 
   const crossTag = ensureResult.crossPackage ? ' (跨包)' : '';
   const prefix = label ? `[${label}] ` : '';
-  console.log(`  ⚠️  ${prefix}依赖缺失: ${currentTarget} -> ${mod}`);
 
   const userChoice = NU.promptWithButtons(
     `检测到依赖缺失：${currentTarget} -> ${mod}${crossTag}\n\n请选择处理方式：`,
     buttons,
-    'AutoSnippet SPM 依赖决策',
+    'AutoSnippet SPM 依赖决策'
   );
 
-  if (userChoice === '取消操作' || (!userChoice && !['直接插入（信任架构）', '提示操作插入', '自动修复依赖'].includes(userChoice))) {
+  if (
+    userChoice === '取消操作' ||
+    (!userChoice && !['直接插入（信任架构）', '提示操作插入', '自动修复依赖'].includes(userChoice))
+  ) {
     return { blocked: true };
   }
 
   if (userChoice === '提示操作插入') {
-    console.log(`  📋 ${prefix}提示操作：依赖缺失 ${currentTarget} -> ${mod}`);
     depWarnings.set(mod, `${currentTarget} -> ${mod}`);
   }
 
   if (userChoice === '自动修复依赖') {
     const fixResult = spmService.addDependency(currentTarget, mod);
     if (fixResult.ok) {
-      console.log(`  ✅ ${prefix}已自动补齐依赖: ${currentTarget} -> ${mod}${fixResult.crossPackage ? ' (跨包)' : ''} (${fixResult.file})`);
       NU.notify(`已补齐依赖：${currentTarget} -> ${mod}`, 'AutoSnippet SPM');
     } else {
       console.warn(`  ⚠️ ${prefix}自动修复失败: ${fixResult.error}，继续插入`);
@@ -482,9 +598,11 @@ function _handleDepReview(ctx) {
  * @returns {boolean}
  */
 function _writeImportLineXcode(importLine, insertLine, XA, CM) {
-  if (!XA.isXcodeRunning()) return false;
+  if (!XA.isXcodeRunning()) {
+    return false;
+  }
   try {
-    const contentToWrite = String(importLine).trim() + '\n';
+    const contentToWrite = `${String(importLine).trim()}\n`;
     const previousClipboard = CM.read();
 
     CM.write(contentToWrite);
@@ -516,7 +634,9 @@ function _writeImportLineFile(filePath, importLine, isSwift) {
     for (let i = 0; i < lines.length; i++) {
       const t = lines[i].trim();
       if (isSwift) {
-        if (t.startsWith('import ') && !t.startsWith('import (')) lastImportIdx = i;
+        if (t.startsWith('import ') && !t.startsWith('import (')) {
+          lastImportIdx = i;
+        }
       } else {
         if (t.startsWith('#import ') || t.startsWith('#include ') || t.startsWith('@import ')) {
           lastImportIdx = i;
@@ -543,14 +663,20 @@ function _writeImportLineFile(filePath, importLine, isSwift) {
  */
 function _getLastImportLine(filePath) {
   try {
-    if (!existsSync(filePath)) return 0;
+    if (!existsSync(filePath)) {
+      return 0;
+    }
     const content = readFileSync(filePath, 'utf8');
     const lines = content.split(/\r?\n/);
     let lastIdx = -1;
     for (let i = 0; i < lines.length; i++) {
       const t = lines[i].trim();
-      if (t.startsWith('#import ') || t.startsWith('@import ')
-        || t.startsWith('#include ') || t.startsWith('import ')) {
+      if (
+        t.startsWith('#import ') ||
+        t.startsWith('@import ') ||
+        t.startsWith('#include ') ||
+        t.startsWith('import ')
+      ) {
         lastIdx = i;
       }
     }
@@ -601,14 +727,16 @@ function _computePasteLineNumber(triggerLineNumber, headerInsertCount, filePath,
  * @returns {Promise<{inserted: string[], skipped: string[], cancelled: boolean}>}
  */
 export async function insertHeaders(watcher, fullPath, headers, opts = {}) {
-  const XA = await import('../../infrastructure/external/XcodeAutomation.js');
-  const CM = await import('../../infrastructure/external/ClipboardManager.js');
-  const NU = await import('../../infrastructure/external/NativeUi.js');
+  const XA = await import('./XcodeAutomation.js');
+  const CM = await import('../../../infrastructure/external/ClipboardManager.js');
+  const NU = await import('../../../infrastructure/external/NativeUi.js');
 
   const result = { inserted: [], skipped: [], cancelled: false };
   /** @type {Map<string, string>} 模块名 → 提示注释（'提示操作插入'按钮选择时记录） */
   const depWarnings = opts.depWarnings instanceof Map ? new Map(opts.depWarnings) : new Map();
-  if (!headers || headers.length === 0) return result;
+  if (!headers || headers.length === 0) {
+    return result;
+  }
 
   const isSwift = opts.isSwift ?? fullPath.endsWith('.swift');
 
@@ -619,7 +747,7 @@ export async function insertHeaders(watcher, fullPath, headers, opts = {}) {
     _collectImportsFromHeaderFile(fullPath, importArray);
   }
 
-  // ── Step 2: SPM 服务准备 ──
+  // ── Step 2: SPM/模块 服务准备 ──
   // 优先复用 opts 传入的 spmService/currentTarget（避免与 _preflightDeps 重复 load）
   let spmService = opts._spmService || null;
   let currentTarget = opts._currentTarget || null;
@@ -628,21 +756,27 @@ export async function insertHeaders(watcher, fullPath, headers, opts = {}) {
     if (opts.moduleName && !inferredModules.includes(opts.moduleName)) {
       inferredModules.push(opts.moduleName);
     }
-    const thirdPartyModules = inferredModules.filter(m => !_SYSTEM_FRAMEWORKS.has(m));
+    const thirdPartyModules = inferredModules.filter((m) => !_SYSTEM_FRAMEWORKS.has(m));
     if (thirdPartyModules.length > 0) {
       try {
-        const { ServiceContainer } = await import('../../injection/ServiceContainer.js');
+        const { ServiceContainer } = await import('../../../injection/ServiceContainer.js');
         const container = ServiceContainer.getInstance();
         spmService = container.get('spmService');
         if (spmService) {
           if (spmService.getFixMode() === 'off') {
             spmService = null;
           } else {
-            try { await spmService.load(); } catch { /* Package.swift 不存在则跳过 */ }
+            try {
+              await spmService.load();
+            } catch {
+              /* Package.swift 不存在则跳过 */
+            }
             currentTarget = spmService.resolveCurrentTarget(fullPath);
           }
         }
-      } catch { /* SPM 检查异常不阻断 */ }
+      } catch {
+        /* SPM 检查异常不阻断 */
+      }
     }
   }
 
@@ -650,15 +784,21 @@ export async function insertHeaders(watcher, fullPath, headers, opts = {}) {
   const xcodeReady = XA.isXcodeRunning();
   // 从当前文件内容计算 import 插入基准行（1-based）
   let content;
-  try { content = readFileSync(fullPath, 'utf8'); } catch { return result; }
+  try {
+    content = readFileSync(fullPath, 'utf8');
+  } catch {
+    return result;
+  }
   const baseInsertLine = findImportInsertLine(content, isSwift) + 1; // 0-based → 1-based
-  let xcodeOffset = 0;      // 每次 Xcode 插入成功后 +1（修正多条 header 行号偏移）
+  let xcodeOffset = 0; // 每次 Xcode 插入成功后 +1（修正多条 header 行号偏移）
   let fileWriteUsed = false; // 一旦使用文件写入，后续全部走文件写入（避免 Xcode reload 冲突）
 
   // ── Step 4: 逐条处理 ──
   for (const header of headers) {
     const headerTrimmed = header.trim();
-    if (!headerTrimmed) continue;
+    if (!headerTrimmed) {
+      continue;
+    }
 
     // ── 三级去重 ──
     // 先按原始格式检查，再按解析后格式检查（同一 header 可能格式不同）
@@ -670,21 +810,19 @@ export async function insertHeaders(watcher, fullPath, headers, opts = {}) {
       projectRoot: watcher?.projectRoot || null,
     });
     const status = _checkImportStatus(importArray, headerTrimmed, isSwift);
-    const statusResolved = (preResolvedHeader !== headerTrimmed)
-      ? _checkImportStatus(importArray, preResolvedHeader, isSwift)
-      : status;
+    const statusResolved =
+      preResolvedHeader !== headerTrimmed
+        ? _checkImportStatus(importArray, preResolvedHeader, isSwift)
+        : status;
     if (status.hasHeader || statusResolved.hasHeader) {
-      console.log(`     ⏭️  已存在（精确匹配）: ${preResolvedHeader}`);
       result.skipped.push(preResolvedHeader);
       continue;
     }
     if (status.hasModule || statusResolved.hasModule) {
-      console.log(`     ⏭️  已存在（模块匹配）: ${preResolvedHeader}`);
       result.skipped.push(preResolvedHeader);
       continue;
     }
     if (status.hasSimilarHeader || statusResolved.hasSimilarHeader) {
-      console.log(`     ⏭️  已存在（相似头文件）: ${preResolvedHeader}`);
       result.skipped.push(preResolvedHeader);
       continue;
     }
@@ -693,7 +831,9 @@ export async function insertHeaders(watcher, fullPath, headers, opts = {}) {
     const headerModules = _inferModulesFromHeaders([headerTrimmed]);
     if (spmService && currentTarget && !opts.skipDepCheck) {
       for (const mod of headerModules) {
-        if (_SYSTEM_FRAMEWORKS.has(mod) || mod === currentTarget) continue;
+        if (_SYSTEM_FRAMEWORKS.has(mod) || mod === currentTarget) {
+          continue;
+        }
 
         const ensureResult = spmService.ensureDependency(currentTarget, mod);
         const decision = _evaluateDepResult(ensureResult, currentTarget, mod);
@@ -702,7 +842,7 @@ export async function insertHeaders(watcher, fullPath, headers, opts = {}) {
           console.warn(`     ⛔ 依赖被阻止: ${currentTarget} -> ${mod} (${decision.reason})`);
           NU.notify(
             `已阻止依赖注入\n${currentTarget} -> ${mod}\n${decision.reason}`,
-            'AutoSnippet SPM 依赖策略',
+            'AutoSnippet SPM 依赖策略'
           );
           result.cancelled = true;
           return result;
@@ -710,10 +850,14 @@ export async function insertHeaders(watcher, fullPath, headers, opts = {}) {
 
         if (decision.action === 'review') {
           const reviewResult = _handleDepReview({
-            spmService, currentTarget, mod, ensureResult, NU, depWarnings,
+            spmService,
+            currentTarget,
+            mod,
+            ensureResult,
+            NU,
+            depWarnings,
           });
           if (reviewResult.blocked) {
-            console.log(`     ⏹️  用户取消`);
             result.cancelled = true;
             return result;
           }
@@ -724,9 +868,9 @@ export async function insertHeaders(watcher, fullPath, headers, opts = {}) {
     // ── 构建带注释后缀的 import 行 ──
     // 复用 dedup 阶段已计算的 preResolvedHeader
     const resolvedHeader = preResolvedHeader;
-    const depHint = headerModules.find(m => depWarnings.has(m));
+    const depHint = headerModules.find((m) => depWarnings.has(m));
     const importLine = depHint
-      ? _withAutoSnippetNote(resolvedHeader) + ` // ⚠️ 依赖缺失: ${depWarnings.get(depHint)}，需手动补齐 Package.swift`
+      ? `${_withAutoSnippetNote(resolvedHeader)} // ⚠️ 依赖缺失: ${depWarnings.get(depHint)}，需手动补齐 Package.swift`
       : _withAutoSnippetNote(resolvedHeader);
 
     // ── 写入：Xcode 自动化优先 → 文件写入回退 ──
@@ -747,11 +891,9 @@ export async function insertHeaders(watcher, fullPath, headers, opts = {}) {
 
     result.inserted.push(resolvedHeader);
     importArray.push(resolvedHeader); // 添加到去重列表（用解析后格式）
-    console.log(`     + ${resolvedHeader}`);
   }
 
   if (result.inserted.length > 0) {
-    console.log(`  📦 已添加 ${result.inserted.length} 个依赖`);
   }
   return result;
 }
@@ -776,17 +918,16 @@ export async function insertHeaders(watcher, fullPath, headers, opts = {}) {
  * @param {import('./FileWatcher.js').FileWatcher} watcher
  */
 export async function insertCodeToXcode(watcher, fullPath, selected, triggerLine) {
-  const XA = await import('../../infrastructure/external/XcodeAutomation.js');
-  const CM = await import('../../infrastructure/external/ClipboardManager.js');
-  const NU = await import('../../infrastructure/external/NativeUi.js');
+  const XA = await import('./XcodeAutomation.js');
+  const CM = await import('../../../infrastructure/external/ClipboardManager.js');
+  const NU = await import('../../../infrastructure/external/NativeUi.js');
 
   const code = selected.code || '';
   if (!code) {
-    console.log(`  ℹ️  选中项无代码内容`);
     return;
   }
 
-  const headersToInsert = (selected.headers || []).filter(h => h && h.trim());
+  const headersToInsert = (selected.headers || []).filter((h) => h?.trim());
   const isSwift = fullPath.endsWith('.swift');
 
   // ═══════════════════════════════════════════════════════
@@ -805,7 +946,9 @@ export async function insertCodeToXcode(watcher, fullPath, selected, triggerLine
     }
     // ── Step 1: 找到触发行号 ──
     let content;
-    try { content = readFileSync(fullPath, 'utf8'); } catch {
+    try {
+      content = readFileSync(fullPath, 'utf8');
+    } catch {
       return _fileInsertFallback(fullPath, selected, triggerLine, headersToInsert, watcher);
     }
     const triggerLineNumber = findTriggerLineNumber(content, triggerLine);
@@ -827,7 +970,6 @@ export async function insertCodeToXcode(watcher, fullPath, selected, triggerLine
     if (headersToInsert.length > 0) {
       const preflight = await _preflightDeps(fullPath, headersToInsert, selected, NU);
       if (preflight.blocked) {
-        console.log(`  ⏹️  依赖检查被阻止，跳过代码插入`);
         return;
       }
       if (preflight.depWarnings && preflight.depWarnings.size > 0) {
@@ -843,7 +985,9 @@ export async function insertCodeToXcode(watcher, fullPath, selected, triggerLine
     if (!cutOk) {
       console.warn(`  ⚠️ 自动剪切失败，降级为文件写入`);
       // Preflight 已通过，skipDepCheck 避免重复弹窗
-      return _fileInsertFallback(fullPath, selected, triggerLine, headersToInsert, watcher, { skipDepCheck: true });
+      return _fileInsertFallback(fullPath, selected, triggerLine, headersToInsert, watcher, {
+        skipDepCheck: true,
+      });
     }
     await _sleep(300);
 
@@ -853,13 +997,8 @@ export async function insertCodeToXcode(watcher, fullPath, selected, triggerLine
     while (codeLines.length > 0 && !codeLines[codeLines.length - 1].trim()) {
       codeLines.pop();
     }
-    const indentedLines = codeLines.map(line => line ? indent + line : line);
-    // 注释标记
-    const commentMarker = _generateInsertMarker(fullPath, selected);
-    const markedLines = commentMarker
-      ? [indent + commentMarker, ...indentedLines]
-      : indentedLines;
-    const indentedCode = markedLines.join('\n');
+    const indentedLines = codeLines.map((line) => (line ? indent + line : line));
+    const indentedCode = indentedLines.join('\n');
 
     // ── Step 5: 插入 Headers ──
     let headerInsertCount = 0;
@@ -873,7 +1012,6 @@ export async function insertCodeToXcode(watcher, fullPath, selected, triggerLine
         _currentTarget: _currentTargetCached,
       });
       if (headerResult.cancelled) {
-        console.log(`  ⏹️  Headers 插入被取消`);
         return;
       }
       headerInsertCount = headerResult.inserted.length;
@@ -886,7 +1024,7 @@ export async function insertCodeToXcode(watcher, fullPath, selected, triggerLine
       triggerLineNumber,
       headerInsertCount,
       fullPath,
-      { forceOffset: headerInsertCount > 0, expectedHeaderCount: headerInsertCount },
+      { forceOffset: headerInsertCount > 0, expectedHeaderCount: headerInsertCount }
     );
 
     // 如果 headers 通过文件写入，等待 Xcode reload
@@ -907,8 +1045,6 @@ export async function insertCodeToXcode(watcher, fullPath, selected, triggerLine
       XA.selectAndPasteInXcode();
       await _sleep(300);
     });
-
-    console.log(`  ✅ 代码已粘贴到 Xcode（可 Cmd+Z 撤销）`);
     NU.notify(`已插入「${selected.title || '代码片段'}」`, 'AutoSnippet');
     return;
   }
@@ -937,44 +1073,67 @@ async function _preflightDeps(fullPath, headers, selected, NU) {
   if (selected.moduleName && !inferredModules.includes(selected.moduleName)) {
     inferredModules.push(selected.moduleName);
   }
-  const thirdPartyModules = inferredModules.filter(m => !_SYSTEM_FRAMEWORKS.has(m));
-  if (thirdPartyModules.length === 0) return result;
+  const thirdPartyModules = inferredModules.filter((m) => !_SYSTEM_FRAMEWORKS.has(m));
+  if (thirdPartyModules.length === 0) {
+    return result;
+  }
 
   try {
-    const { ServiceContainer } = await import('../../injection/ServiceContainer.js');
+    const { ServiceContainer } = await import('../../../injection/ServiceContainer.js');
     const container = ServiceContainer.getInstance();
     const spmService = container.get('spmService');
-    if (!spmService) return result;
+    if (!spmService) {
+      return result;
+    }
 
     // Fix Mode 检查：off 模式完全跳过
-    if (spmService.getFixMode() === 'off') return result;
+    if (spmService.getFixMode() === 'off') {
+      return result;
+    }
 
-    try { await spmService.load(); } catch { return result; }
+    try {
+      await spmService.load();
+    } catch {
+      return result;
+    }
 
     const currentTarget = spmService.resolveCurrentTarget(fullPath);
-    if (!currentTarget) return result;
+    if (!currentTarget) {
+      return result;
+    }
 
     for (const mod of thirdPartyModules) {
-      if (mod === currentTarget) continue;
+      if (mod === currentTarget) {
+        continue;
+      }
 
       const ensureResult = spmService.ensureDependency(currentTarget, mod);
       const decision = _evaluateDepResult(ensureResult, currentTarget, mod);
 
       if (decision.action === 'block') {
-        console.warn(`  ⛔ [Preflight] 依赖被阻止: ${currentTarget} -> ${mod} (${decision.reason})`);
+        console.warn(
+          `  ⛔ [Preflight] 依赖被阻止: ${currentTarget} -> ${mod} (${decision.reason})`
+        );
         NU.notify(
           `已阻止依赖注入\n${currentTarget} -> ${mod}\n${decision.reason}`,
-          'AutoSnippet SPM 依赖策略',
+          'AutoSnippet SPM 依赖策略'
         );
         result.blocked = true;
         return result;
       }
 
       if (decision.action === 'review') {
-        if (!result.depWarnings) result.depWarnings = new Map();
+        if (!result.depWarnings) {
+          result.depWarnings = new Map();
+        }
         const reviewResult = _handleDepReview({
-          spmService, currentTarget, mod, ensureResult, NU,
-          depWarnings: result.depWarnings, label: 'Preflight',
+          spmService,
+          currentTarget,
+          mod,
+          ensureResult,
+          NU,
+          depWarnings: result.depWarnings,
+          label: 'Preflight',
         });
         if (reviewResult.blocked) {
           result.blocked = true;
@@ -997,14 +1156,23 @@ async function _preflightDeps(fullPath, headers, selected, NU) {
 // §13 文件写入降级
 // ═══════════════════════════════════════════════════════════════
 
-async function _fileInsertFallback(fullPath, selected, triggerLine, headersToInsert, watcher, opts = {}) {
+async function _fileInsertFallback(
+  fullPath,
+  selected,
+  triggerLine,
+  headersToInsert,
+  watcher,
+  opts = {}
+) {
   // 先写 headers
   if (headersToInsert.length > 0) {
     const headerResult = await insertHeaders(watcher, fullPath, headersToInsert, {
       moduleName: selected.moduleName || null,
       skipDepCheck: opts.skipDepCheck || false, // Preflight 已通过时跳过重复检查
     });
-    if (headerResult.cancelled) return;
+    if (headerResult.cancelled) {
+      return;
+    }
   }
 
   // 再替换触发行为代码
@@ -1033,27 +1201,20 @@ async function _fileInsertFallback(fullPath, selected, triggerLine, headersToIns
       while (codeLines.length > 0 && !codeLines[codeLines.length - 1].trim()) {
         codeLines.pop();
       }
-      const indentedLines = codeLines.map(line => line ? indent + line : line);
-
-      const commentMarker = _generateInsertMarker(fullPath, selected);
-      const markedLines = commentMarker
-        ? [indent + commentMarker, ...indentedLines]
-        : indentedLines;
+      const indentedLines = codeLines.map((line) => (line ? indent + line : line));
 
-      while (markedLines.length > 0 && !markedLines[markedLines.length - 1].trim()) {
-        markedLines.pop();
+      while (indentedLines.length > 0 && !indentedLines[indentedLines.length - 1].trim()) {
+        indentedLines.pop();
       }
 
-      const newLines = [...lines.slice(0, found), ...markedLines, ...lines.slice(found + 1)];
+      const newLines = [...lines.slice(0, found), ...indentedLines, ...lines.slice(found + 1)];
       const newContent = newLines.join('\n');
       saveEventFilter.markWrite(fullPath, newContent);
       writeFileSync(fullPath, newContent, 'utf8');
-      console.log(`  ✅ 代码已写入文件（替换触发行）`);
     } else {
-      const appendContent = content + '\n' + code + '\n';
+      const appendContent = `${content}\n${code}\n`;
       saveEventFilter.markWrite(fullPath, appendContent);
       writeFileSync(fullPath, appendContent, 'utf8');
-      console.log(`  ✅ 代码已追加到文件末尾`);
     }
   } catch (err) {
     console.warn(`  ⚠️ 文件写入失败: ${err.message}`);
@@ -1070,16 +1231,27 @@ function _generateInsertMarker(filePath, selected) {
     const trigger = selected.trigger ? `[${selected.trigger}]` : '';
     const recipeName = selected.name ? ` from ${selected.name}` : '';
     const timestamp = new Date().toLocaleString('zh-CN', {
-      year: 'numeric', month: '2-digit', day: '2-digit',
-      hour: '2-digit', minute: '2-digit',
+      year: 'numeric',
+      month: '2-digit',
+      day: '2-digit',
+      hour: '2-digit',
+      minute: '2-digit',
     });
 
     const marker = `🤖 AutoSnippet${trigger}${recipeName} @ ${timestamp}`;
 
-    if (['.py', '.rb'].includes(ext)) return `# ${marker}`;
-    if (['.lua', '.sql'].includes(ext)) return `-- ${marker}`;
-    if (['.html', '.xml', '.svg'].includes(ext)) return `<!-- ${marker} -->`;
-    if (['.css', '.scss', '.less'].includes(ext)) return `/* ${marker} */`;
+    if (['.py', '.rb'].includes(ext)) {
+      return `# ${marker}`;
+    }
+    if (['.lua', '.sql'].includes(ext)) {
+      return `-- ${marker}`;
+    }
+    if (['.html', '.xml', '.svg'].includes(ext)) {
+      return `<!-- ${marker} -->`;
+    }
+    if (['.css', '.scss', '.less'].includes(ext)) {
+      return `/* ${marker} */`;
+    }
     return `// ${marker}`;
   } catch {
     return null;
@@ -1094,11 +1266,15 @@ function _generateInsertMarker(filePath, selected) {
  * 查找触发行的行号（1-based，-1 表示未找到）
  */
 export function findTriggerLineNumber(content, triggerLine) {
-  if (!content || !triggerLine) return -1;
+  if (!content || !triggerLine) {
+    return -1;
+  }
   const needle = triggerLine.trim();
   const lines = content.split(/\r?\n/);
   for (let i = 0; i < lines.length; i++) {
-    if (lines[i].trim() === needle) return i + 1;
+    if (lines[i].trim() === needle) {
+      return i + 1;
+    }
   }
   return -1;
 }
@@ -1112,9 +1288,13 @@ export function findImportInsertLine(content, isSwift) {
   for (let i = 0; i < lines.length; i++) {
     const t = lines[i].trim();
     if (isSwift) {
-      if (t.startsWith('import ') && !t.startsWith('import (')) lastImportLine = i;
+      if (t.startsWith('import ') && !t.startsWith('import (')) {
+        lastImportLine = i;
+      }
     } else {
-      if (t.startsWith('#import') || t.startsWith('@import')) lastImportLine = i;
+      if (t.startsWith('#import') || t.startsWith('@import')) {
+        lastImportLine = i;
+      }
     }
   }
   return lastImportLine >= 0 ? lastImportLine + 1 : 0;