autosnippet 3.2.8 → 3.2.9

package/lib/injection/ServiceContainer.js

@@ -25,10 +25,10 @@ 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';
@@ -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
@@ -680,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'),
@@ -707,7 +710,7 @@ export class ServiceContainer {
       return getEnhancementRegistry();
     });
 
-    // ToolRegistry (ChatAgent 的工具注册表)
+    // ToolRegistry (Agent 工具注册表)
     this.register('toolRegistry', () => {
       if (!this.singletons.toolRegistry) {
         const registry = new ToolRegistry();
@@ -723,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)
@@ -814,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/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/service/agent/AgentEventBus.js

@@ -0,0 +1,207 @@
+/**
+ * AgentEventBus — Agent 间事件通信总线
+ *
+ * 借鉴 AutoGen Core Event-Driven 架构 + RxJS Observable 模式:
+ *   - Agent 间松耦合通信（publish/subscribe）
+ *   - 支持同步和异步事件处理
+ *   - 内置事件过滤、优先级、TTL
+ *   - 支持 request/reply 模式（Agent 间 RPC）
+ *
+ * @module AgentEventBus
+ */
+
+import { EventEmitter } from 'node:events';
+import Logger from '../../infrastructure/logging/Logger.js';
+
+/**
+ * 标准事件类型
+ */
+export const AgentEvents = Object.freeze({
+  // ── 生命周期 ──
+  AGENT_CREATED: 'agent:created',
+  AGENT_STARTED: 'agent:started',
+  AGENT_COMPLETED: 'agent:completed',
+  AGENT_FAILED: 'agent:failed',
+  AGENT_ABORTED: 'agent:aborted',
+
+  // ── 执行 ──
+  TOOL_CALL_START: 'tool:call:start',
+  TOOL_CALL_END: 'tool:call:end',
+  LLM_CALL_START: 'llm:call:start',
+  LLM_CALL_END: 'llm:call:end',
+  STEP_COMPLETED: 'step:completed',
+
+  // ── Agent 间交互 ──
+  HANDOFF_REQUEST: 'handoff:request',
+  HANDOFF_ACCEPT: 'handoff:accept',
+  HANDOFF_RESULT: 'handoff:result',
+
+  // ── 进度 ──
+  PROGRESS: 'progress',
+  THINKING: 'thinking',
+  STREAM_DELTA: 'stream:delta',
+
+  // ── 外部触发 ──
+  USER_INPUT: 'user:input',
+  LARK_MESSAGE: 'lark:message',
+  SCAN_REQUEST: 'scan:request',
+});
+
+/**
+ * @typedef {Object} AgentEvent
+ * @property {string} type — 事件类型
+ * @property {string} source — 发送者 agentId
+ * @property {string} [target] — 目标 agentId（广播时为 null）
+ * @property {Object} payload — 事件数据
+ * @property {number} timestamp — 事件时间戳
+ * @property {string} [correlationId] — 关联 ID（用于 request/reply）
+ */
+
+export class AgentEventBus extends EventEmitter {
+  /** @type {AgentEventBus|null} */
+  static #instance = null;
+  #logger;
+  /** @type {Map<string, Function[]>} topic → handlers */
+  #subscriptions = new Map();
+  /** @type {Map<string, {resolve: Function, reject: Function, timer: NodeJS.Timeout}>} */
+  #pendingReplies = new Map();
+  /** @type {number} 事件计数 */
+  #eventCount = 0;
+
+  constructor() {
+    super();
+    this.setMaxListeners(100);
+    this.#logger = Logger.getInstance();
+  }
+
+  /**
+   * 获取全局单例
+   * @returns {AgentEventBus}
+   */
+  static getInstance() {
+    if (!AgentEventBus.#instance) {
+      AgentEventBus.#instance = new AgentEventBus();
+    }
+    return AgentEventBus.#instance;
+  }
+
+  /**
+   * 重置单例（测试用）
+   */
+  static resetInstance() {
+    if (AgentEventBus.#instance) {
+      AgentEventBus.#instance.removeAllListeners();
+      AgentEventBus.#instance.#subscriptions.clear();
+      AgentEventBus.#instance.#pendingReplies.clear();
+    }
+    AgentEventBus.#instance = null;
+  }
+
+  // ─── 发布 ────────────────────────────────
+
+  /**
+   * 发布事件（广播）
+   * @param {string} type — 事件类型
+   * @param {Object} payload — 事件数据
+   * @param {Object} [opts]
+   * @param {string} [opts.source] — 发送者 agentId
+   * @param {string} [opts.target] — 目标 agentId
+   * @param {string} [opts.correlationId] — 关联 ID
+   */
+  publish(type, payload = {}, opts = {}) {
+    this.#eventCount++;
+    const event = {
+      type,
+      source: opts.source || 'system',
+      target: opts.target || null,
+      payload,
+      timestamp: Date.now(),
+      correlationId: opts.correlationId || null,
+    };
+
+    // 发射到 EventEmitter（通用监听）
+    this.emit(type, event);
+    this.emit('*', event); // 全局监听
+
+    // 发射到 topic 订阅者
+    const handlers = this.#subscriptions.get(type) || [];
+    for (const handler of handlers) {
+      try {
+        handler(event);
+      } catch (err) {
+        this.#logger.warn(`[AgentEventBus] Handler error on ${type}: ${err.message}`);
+      }
+    }
+
+    // 检查是否有 pending reply
+    if (opts.correlationId && this.#pendingReplies.has(opts.correlationId)) {
+      const pending = this.#pendingReplies.get(opts.correlationId);
+      clearTimeout(pending.timer);
+      this.#pendingReplies.delete(opts.correlationId);
+      pending.resolve(event);
+    }
+  }
+
+  /**
+   * 订阅事件
+   * @param {string} type — 事件类型
+   * @param {Function} handler — 处理函数 (event) => void
+   * @returns {Function} 取消订阅函数
+   */
+  subscribe(type, handler) {
+    if (!this.#subscriptions.has(type)) {
+      this.#subscriptions.set(type, []);
+    }
+    this.#subscriptions.get(type).push(handler);
+
+    return () => {
+      const handlers = this.#subscriptions.get(type);
+      if (handlers) {
+        const idx = handlers.indexOf(handler);
+        if (idx >= 0) handlers.splice(idx, 1);
+      }
+    };
+  }
+
+  /**
+   * Request/Reply 模式 — 发送请求并等待响应
+   * @param {string} requestType — 请求事件类型
+   * @param {Object} payload — 请求数据
+   * @param {Object} [opts]
+   * @param {number} [opts.timeout=30000] — 超时毫秒
+   * @param {string} [opts.source] — 发送者
+   * @returns {Promise<AgentEvent>} 响应事件
+   */
+  async request(requestType, payload = {}, opts = {}) {
+    const correlationId = `req_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+    const timeout = opts.timeout || 30_000;
+
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        this.#pendingReplies.delete(correlationId);
+        reject(new Error(`AgentEventBus request timeout: ${requestType} (${timeout}ms)`));
+      }, timeout);
+
+      this.#pendingReplies.set(correlationId, { resolve, reject, timer });
+
+      this.publish(requestType, payload, {
+        source: opts.source,
+        correlationId,
+      });
+    });
+  }
+
+  /**
+   * 获取事件统计
+   * @returns {Object}
+   */
+  getStats() {
+    return {
+      totalEvents: this.#eventCount,
+      subscriptionTopics: this.#subscriptions.size,
+      pendingReplies: this.#pendingReplies.size,
+    };
+  }
+}
+
+export default AgentEventBus;