autosnippet 3.2.7 → 3.2.9

package/lib/injection/ServiceContainer.js

@@ -18,17 +18,17 @@ import { IndexingPipeline } from '../infrastructure/vector/IndexingPipeline.js';
 // ─── P0: Vector Storage ──────────────────────────────
 import { JsonVectorAdapter } from '../infrastructure/vector/JsonVectorAdapter.js';
 // ─── P2: SPM ──────────────────────────────────────────
-import { SpmService } from '../platform/ios/spm/SpmService.js';
+import { SpmHelper } from '../platform/ios/spm/SpmHelper.js';
 import { KnowledgeRepositoryImpl } from '../repository/knowledge/KnowledgeRepository.impl.js';
 // ─── P1: Token Usage Tracking ─────────────────────────
 import { TokenUsageStore } from '../repository/token/TokenUsageStore.js';
 // ─── P2: Automation ───────────────────────────────────
 import { AutomationOrchestrator } from '../service/automation/AutomationOrchestrator.js';
 import { BootstrapTaskManager } from '../service/bootstrap/BootstrapTaskManager.js';
-import { ChatAgent } from '../service/chat/ChatAgent.js';
-// ─── P2: ChatAgent (统一 AI Agent) ────────────────────
-import { ToolRegistry } from '../service/chat/ToolRegistry.js';
-import { ALL_TOOLS } from '../service/chat/tools.js';
+// ─── P2: Agent 统一架构 (v7.2) ────────────────────────
+import { AgentFactory } from '../service/agent/AgentFactory.js';
+import { ToolRegistry } from '../service/agent/tools/ToolRegistry.js';
+import { ALL_TOOLS } from '../service/agent/tools/index.js';
 // ─── P2: Content Extraction ─────────────────────────────────────
 import { RecipeExtractor } from '../service/context/RecipeExtractor.js';
 // ─── P3: Cursor Delivery Pipeline ──────────────────────
@@ -59,7 +59,7 @@ import { RetrievalFunnel } from '../service/search/RetrievalFunnel.js';
 import { SearchEngine } from '../service/search/SearchEngine.js';
 import { SkillHooks } from '../service/skills/SkillHooks.js';
 import { VSCodeCodec } from '../service/snippet/codecs/VSCodeCodec.js';
-import { XcodeCodec } from '../service/snippet/codecs/XcodeCodec.js';
+import { XcodeCodec } from '../platform/ios/snippet/XcodeCodec.js';
 import { SnippetFactory } from '../service/snippet/SnippetFactory.js';
 import { SnippetInstaller } from '../service/snippet/SnippetInstaller.js';
 import { DimensionCopy } from '../shared/DimensionCopyRegistry.js';
@@ -121,7 +121,7 @@ export class ServiceContainer {
         this.singletons.skillHooks = bootstrapComponents.skillHooks;
       }
 
-      // AiFactory 模块引用（用于 SpmService AI 扫描）
+      // AiFactory 模块引用（用于 SpmHelper AI 扫描）
       try {
         this.singletons._aiFactory = await import('../external/ai/AiFactory.js');
       } catch {
@@ -177,12 +177,15 @@ export class ServiceContainer {
       // ═══ AI Provider 热重载标记 ═══
       // 记录哪些 singleton key 持有 aiProvider 引用，在 reloadAiProvider() 时需要清除
       this._aiDependentSingletons = [
-        'chatAgent',
+        'agentFactory',
         'searchEngine',
         'retrievalFunnel',
         'indexingPipeline',
       ];
 
+      // ═══ 容器级语言偏好 ═══
+      this.singletons._lang = null;
+
       // 注册仓储
       this._registerRepositories();
 
@@ -211,7 +214,7 @@ export class ServiceContainer {
    * 流程：
    *  1. 替换 singletons.aiProvider
    *  2. 重新创建 _embedProvider（如果主 provider 不支持 embedding）
-   *  3. 清除已缓存的依赖 AI 的 singleton（ChatAgent / SearchEngine 等），
+   *  3. 清除已缓存的依赖 AI 的 singleton（SearchEngine 等），
    *     下次 get() 时会用新 provider 重新创建
    *
    * @param {import('../external/ai/AiProvider.js').AiProvider} newProvider
@@ -658,18 +661,11 @@ export class ServiceContainer {
       return this.singletons.feedbackCollector;
     });
 
-    // SpmService (with AI + tool injection)
+    // SpmHelper (SPM 包结构解析与依赖操作辅助)
     this.register('spmService', () => {
       if (!this.singletons.spmService) {
         const projectRoot = this.singletons._projectRoot || process.cwd();
-        this.singletons.spmService = new SpmService(projectRoot, {
-          aiFactory: this.singletons._aiFactory || null,
-          chatAgent: this.singletons.chatAgent || null,
-          qualityScorer: this.get('qualityScorer'),
-          recipeExtractor: this.singletons._recipeExtractor || null,
-          guardCheckEngine: this.get('guardCheckEngine'),
-          violationsStore: this.get('violationsStore'),
-        });
+        this.singletons.spmService = new SpmHelper(projectRoot);
       }
       return this.singletons.spmService;
     });
@@ -687,8 +683,8 @@ export class ServiceContainer {
       if (!this.singletons.moduleService) {
         const projectRoot = this.singletons._projectRoot || process.cwd();
         this.singletons.moduleService = new ModuleService(projectRoot, {
-          aiFactory: this.singletons._aiFactory || null,
-          chatAgent: this.singletons.chatAgent || null,
+          agentFactory: this.get('agentFactory'),
+          container: this,
           qualityScorer: this.get('qualityScorer'),
           recipeExtractor: this.singletons._recipeExtractor || null,
           guardCheckEngine: this.get('guardCheckEngine'),
@@ -714,7 +710,7 @@ export class ServiceContainer {
       return getEnhancementRegistry();
     });
 
-    // ToolRegistry (ChatAgent 的工具注册表)
+    // ToolRegistry (Agent 工具注册表)
     this.register('toolRegistry', () => {
       if (!this.singletons.toolRegistry) {
         const registry = new ToolRegistry();
@@ -730,21 +726,23 @@ export class ServiceContainer {
       return this.singletons.projectGraph || null;
     });
 
-    // AI Provider（供 MCP handler / ChatAgent / 任意服务层使用）
+    // AI Provider（供 MCP handler / AgentRuntime / 任意服务层使用）
     this.register('aiProvider', () => this.singletons.aiProvider || null);
 
-    // ChatAgent (统一 AI Agent — 单 Agent + ToolRegistry 覆盖全部 AI 能力)
-    this.register('chatAgent', () => {
-      if (!this.singletons.chatAgent) {
+    // AgentFactory (v7.2 统一 Agent 创建工厂 — Preset + DI → AgentRuntime)
+    this.register('agentFactory', () => {
+      if (!this.singletons.agentFactory) {
         const toolRegistry = this.get('toolRegistry');
         const aiProvider = this.singletons.aiProvider || null;
-        this.singletons.chatAgent = new ChatAgent({
+        const projectRoot = this.singletons._projectRoot || process.cwd();
+        this.singletons.agentFactory = new AgentFactory({
+          container: this,
           toolRegistry,
           aiProvider,
-          container: this,
+          projectRoot,
         });
       }
-      return this.singletons.chatAgent;
+      return this.singletons.agentFactory;
     });
 
     // SkillHooks (Skill 生命周期钩子 — 加载 skills/*/hooks.js)
@@ -766,9 +764,11 @@ export class ServiceContainer {
       if (!this.singletons.cursorDeliveryPipeline) {
         const knowledgeService = this.get('knowledgeService');
         const projectRoot = this.singletons._projectRoot || process.cwd();
+        const database = this.get('database');
         this.singletons.cursorDeliveryPipeline = new CursorDeliveryPipeline({
           knowledgeService,
           projectRoot,
+          database,
           logger: this.logger,
         });
       }
@@ -819,6 +819,48 @@ export class ServiceContainer {
     });
   }
 
+  // ─── 容器级语言偏好 ─────
+
+  /**
+   * 获取当前默认 UI 语言偏好
+   * @returns {'zh'|'en'|null}
+   */
+  getLang() {
+    return this.singletons._lang || null;
+  }
+
+  /**
+   * 设置默认 UI 语言偏好（影响 Agent 回复语言）
+   * @param {'zh'|'en'|null} lang
+   */
+  setLang(lang) {
+    this.singletons._lang = lang || null;
+  }
+
+  // ─── 工具执行上下文构建器 ─────────────────────
+
+  /**
+   * 构建 ToolRegistry.execute() 所需的上下文对象。
+   *
+   * 工具执行上下文构建
+   * 迁移后: 所有直接调用 ToolRegistry 的站点都使用此方法
+   *
+   * @param {Object} [extras] — 合并到上下文的额外字段
+   * @returns {Object} 工具执行上下文
+   */
+  buildToolContext(extras = {}) {
+    return {
+      container: this,
+      aiProvider: this.singletons.aiProvider || null,
+      projectRoot: this.singletons._projectRoot || process.cwd(),
+      logger: this.logger,
+      source: extras.source || 'system',
+      lang: extras.lang || this.singletons._lang || null,
+      fileCache: this.singletons._fileCache || null,
+      ...extras,
+    };
+  }
+
   /**
    * 注册服务或工厂函数
    */

package/lib/platform/ScreenCaptureService.js

@@ -0,0 +1,177 @@
+/**
+ * ScreenCaptureService — macOS 原生截图服务
+ *
+ * 使用 ScreenCaptureKit (via Swift CLI) 截取窗口/屏幕画面。
+ * 息屏可用，无需 OBS。
+ *
+ * 依赖：resources/native-ui/screenshot.swift 编译产物
+ */
+
+import { existsSync, mkdirSync, statSync as fstatSync } from 'node:fs';
+import { join, dirname } from 'node:path';
+import { execSync, execFileSync } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
+import Logger from '../infrastructure/logging/Logger.js';
+
+const logger = Logger.getInstance();
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+/** Swift 源文件路径 */
+const SWIFT_SRC = join(__dirname, '../../resources/native-ui/screenshot.swift');
+/** 编译产物路径 */
+const BINARY_PATH = join(__dirname, '../../resources/native-ui/screenshot');
+
+let _binaryReady = false;
+
+/**
+ * 确保 Swift 截图工具已编译
+ * @returns {{ready: boolean, error?: string}}
+ */
+function ensureBinary() {
+  if (_binaryReady && existsSync(BINARY_PATH)) return { ready: true };
+
+  if (!existsSync(SWIFT_SRC)) {
+    return { ready: false, error: `Swift source not found: ${SWIFT_SRC}` };
+  }
+
+  // 检查是否需要重新编译（源文件比二进制新）
+  const needsBuild = !existsSync(BINARY_PATH) ||
+    (() => {
+      try {
+        const srcTime = fstatSync(SWIFT_SRC).mtimeMs;
+        const binTime = fstatSync(BINARY_PATH).mtimeMs;
+        return srcTime > binTime;
+      } catch {
+        return true;
+      }
+    })();
+
+  if (needsBuild) {
+    logger.info('[Screenshot] Compiling screenshot tool...');
+    try {
+      execSync(
+        `swiftc -O -framework ScreenCaptureKit -framework AppKit "${SWIFT_SRC}" -o "${BINARY_PATH}"`,
+        { timeout: 60000, stdio: ['pipe', 'pipe', 'pipe'] },
+      );
+      logger.info('[Screenshot] ✅ Compiled successfully');
+    } catch (err) {
+      const stderr = err.stderr?.toString() || err.message;
+      logger.error(`[Screenshot] Compilation failed: ${stderr}`);
+      return { ready: false, error: `Swift compilation failed: ${stderr.slice(0, 200)}` };
+    }
+  }
+
+  _binaryReady = true;
+  return { ready: true };
+}
+
+/**
+ * 执行截图工具
+ * @param {string[]} args — CLI 参数
+ * @returns {{success: boolean, data?: object, error?: string}}
+ */
+function exec(args = []) {
+  const check = ensureBinary();
+  if (!check.ready) return { success: false, error: check.error };
+
+  try {
+    const stdout = execFileSync(BINARY_PATH, args, {
+      timeout: 15000,
+      encoding: 'utf-8',
+      maxBuffer: 1024 * 1024,
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+
+    const result = JSON.parse(stdout.trim());
+    return { success: true, data: result };
+  } catch (err) {
+    // 尝试从 stderr 中解析 JSON 错误
+    const stderr = err.stderr?.toString() || '';
+    try {
+      const errObj = JSON.parse(stderr.trim());
+      return { success: false, error: errObj.error || stderr };
+    } catch {
+      return { success: false, error: stderr || err.message };
+    }
+  }
+}
+
+// ═══════════════════════════════════════════════════════
+//  公开 API
+// ═══════════════════════════════════════════════════════
+
+/**
+ * 截取屏幕或窗口画面（核心功能 — 息屏可用）
+ *
+ * @param {object} opts
+ * @param {string} [opts.windowTitle] — 窗口标题关键词（模糊匹配），默认截整屏
+ * @param {string} [opts.format] — 'jpeg' | 'png'
+ * @param {number} [opts.scale] — 缩放因子 (0.25-2.0)
+ * @param {string} [opts.outputPath] — 输出路径，默认临时目录
+ * @returns {Promise<{success: boolean, path?: string, width?: number, height?: number, error?: string}>}
+ */
+export async function screenshot(opts = {}) {
+  const args = [];
+
+  if (opts.windowTitle) {
+    args.push('--window', opts.windowTitle);
+  }
+  if (opts.format) {
+    args.push('--format', opts.format);
+  }
+  if (opts.scale) {
+    args.push('--scale', String(opts.scale));
+  }
+  if (opts.outputPath) {
+    args.push('--output', opts.outputPath);
+  }
+
+  const result = exec(args);
+
+  if (result.success && result.data) {
+    logger.info(`[Screenshot] ✅ Captured: ${result.data.path} (${result.data.width}x${result.data.height})`);
+    return {
+      success: true,
+      path: result.data.path,
+      width: result.data.width,
+      height: result.data.height,
+      format: result.data.format,
+      bytes: result.data.bytes,
+    };
+  }
+
+  logger.warn(`[Screenshot] ❌ Failed: ${result.error}`);
+  return { success: false, error: result.error };
+}
+
+/**
+ * 列出所有可截取的窗口
+ * @returns {Promise<{success: boolean, windows?: Array, error?: string}>}
+ */
+export async function listWindows() {
+  const result = exec(['--list-windows']);
+
+  if (result.success && result.data) {
+    return { success: true, windows: result.data };
+  }
+
+  return { success: false, error: result.error };
+}
+
+/**
+ * 检查截图服务是否可用
+ * @returns {{available: boolean, error?: string}}
+ */
+export function isScreenCaptureAvailable() {
+  const check = ensureBinary();
+  if (!check.ready) return { available: false, error: check.error };
+
+  // 尝试列出窗口来验证权限
+  const result = exec(['--list-windows']);
+  return {
+    available: result.success,
+    error: result.success ? undefined : result.error,
+  };
+}

package/lib/platform/ios/index.js

@@ -14,7 +14,7 @@
  *     PlaceholderConverter.js — Xcode <#…#> ↔ VSCode ${N:…} 占位符转换
  *
  *   spm/
- *     SpmService.js          — Swift Package Manager 服务（Target / 依赖 / 策略）
+ *     SpmHelper.js           — SPM 包结构解析与依赖操作辅助工具
  *     SpmDiscoverer.js       — SPM 项目自动发现（ProjectDiscoverer 接口）
  *     PackageSwiftParser.js  — Package.swift 解析器
  *     DependencyGraph.js     — SPM Target 依赖图
@@ -36,7 +36,7 @@ export { PackageSwiftParser } from './spm/PackageSwiftParser.js';
 export { PolicyEngine } from './spm/PolicyEngine.js';
 export { SpmDiscoverer } from './spm/SpmDiscoverer.js';
 // ── Swift Package Manager ──
-export { SpmService } from './spm/SpmService.js';
+export { SpmHelper } from './spm/SpmHelper.js';
 export { saveEventFilter } from './xcode/SaveEventFilter.js';
 // ── Xcode IDE 自动化 ──
 export {

package/lib/platform/ios/routes/spm.js

@@ -379,12 +379,12 @@ router.post(
     const { maxFiles, skipGuard, contentMaxLines } = req.body || {};
 
     const container = getServiceContainer();
-    const chatAgent = container.get('chatAgent');
+    const agentFactory = container.get('agentFactory');
 
     logger.info('Bootstrap cold start initiated (v5: async fill mode)');
 
     // ── 同步阶段: 快速执行 Phase 1-4 → 返回骨架 ──
-    const bootstrapResult = await chatAgent.executeTool('bootstrap_knowledge', {
+    const bootstrapResult = await agentFactory.bootstrapKnowledge({
       maxFiles: maxFiles || 500,
       skipGuard: skipGuard || false,
       contentMaxLines: contentMaxLines || 120,

package/lib/platform/ios/spm/PackageSwiftParser.js

@@ -218,10 +218,11 @@ export class PackageSwiftParser {
 
   #extractDependencies(content) {
     const deps = [];
-    const re = /\.package\s*\(\s*url\s*:\s*"([^"]+)"[^)]*\)/g;
+
+    // 1. URL 依赖: .package(url: "...", ...)
+    const urlRe = /\.package\s*\(\s*url\s*:\s*"([^"]+)"[^)]*\)/g;
     let m;
-    while ((m = re.exec(content)) !== null) {
-      // 提取版本约束
+    while ((m = urlRe.exec(content)) !== null) {
       const block = m[0];
       const fromMatch = block.match(/from\s*:\s*"([^"]+)"/);
       const exactMatch = block.match(/exact\s*:\s*"([^"]+)"/);
@@ -231,6 +232,16 @@ export class PackageSwiftParser {
         type: 'package',
       });
     }
+
+    // 2. Local path 依赖: .package(path: "...")
+    const pathRe = /\.package\s*\(\s*path\s*:\s*"([^"]+)"\s*\)/g;
+    while ((m = pathRe.exec(content)) !== null) {
+      deps.push({
+        path: m[1],
+        type: 'local',
+      });
+    }
+
     return deps;
   }
 

package/lib/platform/ios/spm/SpmDiscoverer.js

@@ -1,17 +1,18 @@
 /**
  * @module SpmDiscoverer
- * @description 包装现有 SpmService，适配 ProjectDiscoverer 接口
+ * @description 包装现有 SpmHelper，适配 ProjectDiscoverer 接口
  *
  * 检测: 项目根或子目录存在 Package.swift
  */
 
 import { existsSync, readdirSync } from 'node:fs';
-import { basename, join, relative } from 'node:path';
+import { basename, dirname, join, relative } from 'node:path';
 import { ProjectDiscoverer } from '../../../core/discovery/ProjectDiscoverer.js';
 import { LanguageService } from '../../../shared/LanguageService.js';
+import { PackageSwiftParser } from './PackageSwiftParser.js';
 
 export class SpmDiscoverer extends ProjectDiscoverer {
-  /** @type {import('./SpmService.js').SpmService|null} */
+  /** @type {import('./SpmHelper.js').SpmHelper|null} */
   #spm = null;
   #projectRoot = null;
 
@@ -52,9 +53,9 @@ export class SpmDiscoverer extends ProjectDiscoverer {
 
   async load(projectRoot) {
     this.#projectRoot = projectRoot;
-    // 动态加载 SpmService（避免循环导入）
-    const { SpmService } = await import('./SpmService.js');
-    this.#spm = new SpmService(projectRoot);
+    // 动态加载 SpmHelper（避免循环导入）
+    const { SpmHelper } = await import('./SpmHelper.js');
+    this.#spm = new SpmHelper(projectRoot);
     await this.#spm.load();
   }
 
@@ -97,21 +98,126 @@ export class SpmDiscoverer extends ProjectDiscoverer {
   }
 
   async getDependencyGraph() {
-    if (!this.#spm) {
+    if (!this.#projectRoot) {
+      return { nodes: [], edges: [] };
+    }
+
+    // 直接用 PackageSwiftParser 构建依赖图，不依赖 SpmHelper
+    const parser = new PackageSwiftParser(this.#projectRoot);
+    const allPkgPaths = parser.findAllPackageSwifts(this.#projectRoot);
+
+    if (allPkgPaths.length === 0) {
       return { nodes: [], edges: [] };
     }
-    const raw = await this.#spm.getDependencyGraph();
-    return {
-      nodes: (raw.nodes || []).map((n) => (typeof n === 'string' ? n : n.id || n.name)),
-      edges: (raw.edges || []).map((e) => ({
-        from: e.from,
-        to: e.to,
-        type: 'depends_on',
-      })),
-    };
+
+    const nodes = [];
+    const edges = [];
+    const pkgNameSet = new Set();
+    // targetName → 所属 packageName 映射（用于跨包 target 依赖解析）
+    const targetToPkg = new Map();
+
+    // ── 第一遍：收集所有 package + target 节点 ──
+    const allParsed = [];
+    // 记录 umbrella 包名（无 targets 且无 products 的纯组织性入口包），不作为图节点
+    const umbrellaNames = new Set();
+    for (const pkgPath of allPkgPaths) {
+      try {
+        const parsed = parser.parse(pkgPath);
+        if (pkgNameSet.has(parsed.name)) continue;
+        pkgNameSet.add(parsed.name);
+        allParsed.push({ ...parsed, _dir: dirname(pkgPath) });
+
+        // 跳过 umbrella 包（无 targets + 无 products）——它只是组织子包的入口
+        const hasTargets = parsed.targets && parsed.targets.length > 0;
+        const hasProducts = parsed.products && parsed.products.length > 0;
+        if (!hasTargets && !hasProducts) {
+          umbrellaNames.add(parsed.name);
+          continue;
+        }
+
+        // package 节点
+        nodes.push({
+          id: parsed.name,
+          label: parsed.name,
+          type: 'package',
+          fullPath: dirname(pkgPath),
+          targetCount: parsed.targets.length,
+        });
+
+        // target 节点
+        for (const t of parsed.targets) {
+          nodes.push({
+            id: t.name,
+            label: t.name,
+            type: 'target',
+            parent: parsed.name,
+            targetType: t.type,
+          });
+          targetToPkg.set(t.name, parsed.name);
+        }
+
+        // product name → package（product 名可能和 target 名不同）
+        for (const prod of parsed.products || []) {
+          if (!targetToPkg.has(prod.name)) {
+            targetToPkg.set(prod.name, parsed.name);
+          }
+        }
+      } catch {
+        // 解析失败，跳过
+      }
+    }
+
+    // ── 第二遍：构建 edges ──
+    for (const parsed of allParsed) {
+      // 跳过 umbrella 包的边
+      if (umbrellaNames.has(parsed.name)) continue;
+
+      // 包级 local path 依赖
+      for (const dep of parsed.dependencies || []) {
+        if (dep.type === 'local' && dep.path) {
+          const depPkgSwift = join(parsed._dir, dep.path, 'Package.swift');
+          if (existsSync(depPkgSwift)) {
+            try {
+              const depParsed = parser.parse(depPkgSwift);
+              // 跳过指向 umbrella 包的边
+              if (!umbrellaNames.has(depParsed.name)) {
+                edges.push({ from: parsed.name, to: depParsed.name, type: 'depends_on' });
+              }
+            } catch {
+              const targetName = basename(dep.path);
+              if (!umbrellaNames.has(targetName)) {
+                edges.push({ from: parsed.name, to: targetName, type: 'depends_on' });
+              }
+            }
+          }
+        } else if (dep.url) {
+          const remoteName = basename(dep.url).replace(/\.git$/, '');
+          if (!pkgNameSet.has(remoteName)) {
+            pkgNameSet.add(remoteName);
+            nodes.push({ id: remoteName, label: remoteName, type: 'remote', indirect: true });
+          }
+          edges.push({ from: parsed.name, to: remoteName, type: 'depends_on' });
+        }
+      }
+
+      // target 级依赖
+      for (const t of parsed.targets || []) {
+        // target → parent package (contains)
+        edges.push({ from: parsed.name, to: t.name, type: 'contains' });
+
+        for (const depName of t.dependencies || []) {
+          // target → target 依赖（跳过指向 umbrella 包的）
+          if (!umbrellaNames.has(depName)) {
+            edges.push({ from: t.name, to: depName, type: 'depends_on' });
+          }
+        }
+      }
+    }
+
+    return { nodes, edges };
   }
 
-  /** 获取底层 SpmService（向后兼容） */
+  /** 获取底层 SpmHelper（向后兼容） */
   getSpmService() {
     return this.#spm;
   }