autosnippet 2.6.0 → 2.7.1

package/lib/service/chat/ToolRegistry.js

@@ -12,6 +12,38 @@
 
 import Logger from '../../infrastructure/logging/Logger.js';
 
+/**
+ * AI 模型常见的参数命名变体 → schema 标准名映射
+ * 覆盖 Gemini / GPT / DeepSeek / Claude 常见偏好
+ */
+const PARAM_ALIASES = {
+  // read_project_file 变体
+  file:          'filePath',
+  filename:      'filePath',
+  file_name:     'filePath',
+  filepath:      'filePath',
+  file_path:     'filePath',
+  path:          'filePath',
+  // search_project_code 变体
+  query:         'pattern',
+  search:        'pattern',
+  keyword:       'pattern',
+  search_query:  'pattern',
+  search_text:   'pattern',
+  regex:         'pattern',
+  // 通用变体
+  is_regex:      'isRegex',
+  file_filter:   'fileFilter',
+  context_lines: 'contextLines',
+  max_results:   'maxResults',
+  start_line:    'startLine',
+  end_line:      'endLine',
+  max_lines:     'maxLines',
+  candidate_id:  'candidateId',
+  recipe_id:     'recipeId',
+  skill_name:    'skillName',
+};
+
 export class ToolRegistry {
   #tools = new Map();
   #logger;
@@ -32,7 +64,6 @@ export class ToolRegistry {
     const { name, description, handler, parameters = {} } = toolDef;
     if (!name || !handler) throw new Error('Tool must have name and handler');
     this.#tools.set(name, { name, description, parameters, handler });
-    this.#logger.debug(`Tool registered: ${name}`);
   }
 
   /**
@@ -41,14 +72,18 @@ export class ToolRegistry {
    */
   registerAll(defs) {
     for (const def of defs) this.register(def);
+    this.#logger.info(`[ToolRegistry] ${defs.length} tools registered`);
   }
 
   /**
    * 获取工具定义（不含 handler，给 LLM prompt 使用）
+   * @param {string[]} [allowedTools] — 限制返回的工具列表（不传则返回全部）
+   * @returns {Array<{name: string, description: string, parameters: object}>}
    */
-  getToolSchemas() {
+  getToolSchemas(allowedTools) {
     const schemas = [];
-    for (const [, tool] of this.#tools) {
+    for (const [name, tool] of this.#tools) {
+      if (allowedTools && !allowedTools.includes(name)) continue;
       schemas.push({
         name: tool.name,
         description: tool.description,
@@ -69,9 +104,13 @@ export class ToolRegistry {
     const tool = this.#tools.get(name);
     if (!tool) throw new Error(`Tool '${name}' not found`);
 
-    this.#logger.debug(`Tool execute: ${name}`, { params: Object.keys(params) });
+    // 参数归一化: AI 可能用 snake_case / 不同命名传参，
+    // 将其映射到 tool schema 中定义的 camelCase 参数名
+    const normalized = this.#normalizeParams(params, tool.parameters);
+
+    this.#logger.debug(`Tool execute: ${name}`, { params: Object.keys(normalized) });
     try {
-      const result = await tool.handler(params, context);
+      const result = await tool.handler(normalized, context);
       return result;
     } catch (err) {
       this.#logger.error(`Tool '${name}' failed`, { error: err.message });
@@ -79,6 +118,59 @@ export class ToolRegistry {
     }
   }
 
+  /**
+   * 参数归一化 — 将 AI 传来的 snake_case / 变体参数名映射到 schema 定义名
+   *
+   * 例: AI 传 { file_path: "x.m" } → schema 定义 filePath → 归一化为 { filePath: "x.m" }
+   *     AI 传 { file: "x.m" }      → schema 定义 filePath → 通过别名表匹配
+   *
+   * 策略:
+   *   1. schema 中已有的 key → 保留不动
+   *   2. snake_case → camelCase 自动转换
+   *   3. 常用别名表兜底
+   */
+  #normalizeParams(params, schema) {
+    if (!params || typeof params !== 'object') return params || {};
+    const properties = schema?.properties || {};
+    const schemaKeys = new Set(Object.keys(properties));
+    if (schemaKeys.size === 0) return params;
+
+    const result = {};
+    const unmatched = [];
+
+    for (const [key, value] of Object.entries(params)) {
+      // 1. 精确匹配 — 已在 schema 中
+      if (schemaKeys.has(key)) {
+        result[key] = value;
+        continue;
+      }
+
+      // 2. snake_case → camelCase 转换
+      const camelKey = key.replace(/_([a-z])/g, (_, c) => c.toUpperCase());
+      if (schemaKeys.has(camelKey)) {
+        result[camelKey] = value;
+        continue;
+      }
+
+      // 3. 常用别名映射
+      const aliased = PARAM_ALIASES[key];
+      if (aliased && schemaKeys.has(aliased)) {
+        result[aliased] = value;
+        continue;
+      }
+
+      // 4. 无匹配 — 保留原样（handler 可能有自定义处理）
+      result[key] = value;
+      unmatched.push(key);
+    }
+
+    if (unmatched.length > 0) {
+      this.#logger.debug(`[ToolRegistry] param normalization: unmatched keys [${unmatched.join(', ')}]`);
+    }
+
+    return result;
+  }
+
   /**
    * 检查工具是否存在
    */
@@ -86,6 +178,58 @@ export class ToolRegistry {
     return this.#tools.has(name);
   }
 
+  /**
+   * 转换为 Gemini functionDeclarations 格式
+   * 供 GoogleGeminiProvider.chatWithTools() 使用
+   *
+   * @param {string[]} [allowedTools] — 限制可用工具列表（不传则返回全部）
+   * @returns {Array<{name: string, description: string, parameters: object}>}
+   */
+  toFunctionDeclarations(allowedTools) {
+    const result = [];
+    for (const [name, tool] of this.#tools) {
+      if (allowedTools && !allowedTools.includes(name)) continue;
+      result.push({
+        name: tool.name,
+        description: tool.description || '',
+        parameters: this.#sanitizeSchemaForGemini(tool.parameters),
+      });
+    }
+    return result;
+  }
+
+  /**
+   * 清理 JSON Schema 使之兼容 Gemini API 的 OpenAPI 子集
+   * Gemini API 不支持某些 JSON Schema 扩展语法
+   */
+  #sanitizeSchemaForGemini(schema) {
+    if (!schema || typeof schema !== 'object') {
+      return { type: 'object', properties: {} };
+    }
+
+    const cleaned = { ...schema };
+
+    // 确保 type 存在
+    if (!cleaned.type) cleaned.type = 'object';
+
+    // 递归清理 properties
+    if (cleaned.properties) {
+      const props = {};
+      for (const [key, val] of Object.entries(cleaned.properties)) {
+        const prop = { ...val };
+        // 移除 Gemini 不支持的字段
+        delete prop.default;
+        delete prop.examples;
+        // 确保 type 存在
+        if (!prop.type) prop.type = 'string';
+        props[key] = prop;
+      }
+      cleaned.properties = props;
+    }
+
+    return cleaned;
+  }
+
   /**
    * 获取所有工具名
    */