autosnippet 3.2.6 → 3.2.8

package/lib/http/routes/task.js

@@ -59,6 +59,7 @@ router.post(
       if (result.success === false) {
         return res.status(400).json(result);
       }
+
       return res.json(result);
     } catch (err) {
       return res.status(400).json({

package/lib/infrastructure/database/migrations/003_add_remote_commands.js

@@ -0,0 +1,27 @@
+/**
+ * Migration 003 — Remote Command Queue
+ *
+ * 飞书/Telegram 等 IM 远程指令队列表
+ * VSCode 扩展轮询 pending → 注入 Copilot Chat → 回写结果
+ */
+export default function migrate(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS remote_commands (
+      id              TEXT PRIMARY KEY,
+      source          TEXT NOT NULL DEFAULT 'lark',
+      chat_id         TEXT,
+      message_id      TEXT,
+      user_id         TEXT,
+      user_name       TEXT,
+      command         TEXT NOT NULL,
+      status          TEXT NOT NULL DEFAULT 'pending',
+      result          TEXT,
+      created_at      INTEGER NOT NULL,
+      claimed_at      INTEGER,
+      completed_at    INTEGER
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_remote_commands_status ON remote_commands(status);
+    CREATE INDEX IF NOT EXISTS idx_remote_commands_created ON remote_commands(created_at);
+  `);
+}

package/lib/injection/ServiceContainer.js

@@ -18,7 +18,7 @@ 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';
@@ -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 {
@@ -658,18 +658,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;
     });
@@ -766,9 +759,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,
         });
       }

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/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;
   }