closer-code 1.0.0 → 1.0.1

package/src/mcp/tools-adapter.js

@@ -0,0 +1,149 @@
+/**
+ * MCP 工具适配器
+ * 
+ * 将 MCP 工具转换为 betaZodTool 格式，以便与现有工具系统集成
+ */
+
+import { z } from 'zod';
+import { betaZodTool } from '@anthropic-ai/sdk/helpers/beta/zod';
+import { getMCPClientManager } from './client.js';
+import { logger } from '../logger.js';
+
+/**
+ * 将 MCP 工具的 JSON Schema 转换为 Zod Schema
+ * @param {Object} jsonSchema - MCP 工具的 inputSchema (JSON Schema)
+ * @returns {z.ZodTypeAny} Zod Schema
+ */
+function jsonSchemaToZod(jsonSchema) {
+  // 简化版本：处理常见的 JSON Schema 类型
+  // 实际项目中可能需要更完整的转换
+
+  if (!jsonSchema || !jsonSchema.type) {
+    return z.object({});
+  }
+
+  const { type, properties, required } = jsonSchema;
+
+  if (type === 'object' && properties) {
+    const shape = {};
+
+    for (const [propName, propSchema] of Object.entries(properties)) {
+      let zodType;
+
+      switch (propSchema.type) {
+        case 'string':
+          zodType = z.string();
+          break;
+        case 'number':
+        case 'integer':
+          zodType = z.number();
+          break;
+        case 'boolean':
+          zodType = z.boolean();
+          break;
+        case 'array':
+          zodType = z.array(z.any());
+          break;
+        case 'object':
+          zodType = z.object({});
+          break;
+        default:
+          zodType = z.any();
+      }
+
+      // 处理可选字段
+      const isRequired = Array.isArray(required) && required.includes(propName);
+      shape[propName] = isRequired ? zodType : zodType.optional();
+    }
+
+    return z.object(shape);
+  }
+
+  // 其他类型作为 any 处理
+  return z.any();
+}
+
+/**
+ * 为 MCP 工具创建描述文本（包含服务器信息）
+ * @param {string} serverName - 服务器名称
+ * @param {Object} mcpTool - MCP 工具定义
+ * @returns {string} 增强的描述
+ */
+function enhanceDescription(serverName, mcpTool) {
+  const baseDesc = mcpTool.description || mcpTool.name;
+  return `[MCP: ${serverName}] ${baseDesc}`;
+}
+
+/**
+ * 将 MCP 工具列表转换为 betaZodTool 列表
+ * @param {Array} mcpTools - MCP 工具列表
+ * @returns {Array} betaZodTool 列表
+ */
+export function convertMCPToolsToBetaZod(mcpTools) {
+  const converted = [];
+
+  for (const mcpTool of mcpTools) {
+    try {
+      const { name, originalName, serverName, description, inputSchema } = mcpTool;
+
+      // 转换 JSON Schema 为 Zod Schema
+      const zodSchema = jsonSchemaToZod(inputSchema);
+
+      // 创建 betaZodTool
+      const betaTool = betaZodTool({
+        name: name,
+        description: enhanceDescription(serverName, { name: originalName, description }),
+        inputSchema: zodSchema,
+        run: async (input) => {
+          const manager = getMCPClientManager();
+
+          logger.debug(`执行 MCP 工具: ${serverName}.${originalName}`);
+
+          const result = await manager.callTool(serverName, originalName, input);
+
+          // 返回 JSON 字符串（与现有工具保持一致）
+          return JSON.stringify(result);
+        }
+      });
+
+      converted.push(betaTool);
+    } catch (error) {
+      logger.error(`转换 MCP 工具失败 (${mcpTool.name}): ${error.message}`);
+    }
+  }
+
+  return converted;
+}
+
+/**
+ * 获取所有 MCP 工具的 betaZodTool 格式
+ * @returns {Promise<Array>} betaZodTool 列表
+ */
+export async function getAllMCPToolsAsBetaZod() {
+  const manager = getMCPClientManager();
+  const mcpTools = manager.getAllTools();
+
+  return convertMCPToolsToBetaZod(mcpTools);
+}
+
+/**
+ * 生成 MCP 工具的简短摘要
+ * @param {string} toolName - 工具名称
+ * @param {Object} input - 工具输入
+ * @param {Object} result - 工具结果
+ * @returns {string} 简短摘要
+ */
+export function generateMCPToolSummary(toolName, input, result) {
+  // 解析工具名称（格式：serverName_toolName）
+  const parts = toolName.split('_');
+  const serverName = parts[0];
+  const shortToolName = parts.slice(1).join('_');
+
+  const success = result?.success;
+
+  if (success) {
+    return `✓ [${serverName}] ${shortToolName}`;
+  } else {
+    return `✗ [${serverName}] ${shortToolName}`;
+  }
+}

package/src/planner.js

@@ -80,11 +80,16 @@ export class TaskPlan {
 export class TaskPlanner {
   constructor(config) {
     this.config = config;
-    this.aiClient = createAIClient(config);
+    this._aiClientPromise = createAIClient(config);
     this.toolExecutor = new ToolExecutor(config);
     this.memory = loadMemory();
   }
 
+  // 延迟初始化的 getter
+  async getAIClient() {
+    return await this._aiClientPromise;
+  }
+
   /**
    * 为用户请求创建任务计划
    */
@@ -128,7 +133,8 @@ Respond with only the JSON plan, no additional text.`
     ];
 
     try {
-      const response = await this.aiClient.chat(messages, { systemPrompt });
+      const aiClient = await this.getAIClient();
+      const response = await aiClient.chat(messages, { systemPrompt });
       const text = response.content.find(c => c.type === 'text')?.text || '{}';
       const planData = JSON.parse(text);
 
@@ -309,7 +315,8 @@ Respond with a JSON object describing the patterns found.`;
     ];
 
     try {
-      const response = await this.aiClient.chat(messages, { systemPrompt });
+      const aiClient = await this.getAIClient();
+      const response = await aiClient.chat(messages, { systemPrompt });
       const text = response.content.find(c => c.type === 'text')?.text || '{}';
       const patterns = JSON.parse(text);
 
@@ -335,10 +342,15 @@ Respond with a JSON object describing the patterns found.`;
 export class ProblemDiagnoser {
   constructor(config) {
     this.config = config;
-    this.aiClient = createAIClient(config);
+    this._aiClientPromise = createAIClient(config);
     this.toolExecutor = new ToolExecutor(config);
   }
 
+  // 延迟初始化的 getter
+  async getAIClient() {
+    return await this._aiClientPromise;
+  }
+
   /**
    * 诊断错误
    */
@@ -365,7 +377,8 @@ ${contextInfo ? `\nContext:\n${contextInfo}` : ''}`
       }
     ];
 
-    const response = await this.aiClient.chat(messages, { systemPrompt });
+    const aiClient = await this.getAIClient();
+    const response = await aiClient.chat(messages, { systemPrompt });
     return response.content.find(c => c.type === 'text')?.text;
   }
 

package/src/prompt-builder.js

@@ -0,0 +1,159 @@
+/**
+ * 系统提示词构建器
+ *
+ * 提供灵活的方式来构建和优化 AI 助手的系统提示词
+ */
+
+import { loadMemory } from './config.js';
+
+/**
+ * 读取全局 cloco.md 文件内容
+ */
+async function readGlobalCloco() {
+  try {
+    const fs = await import('fs/promises');
+    const path = await import('path');
+    const os = await import('os');
+    const homeDir = os.homedir();
+    const globalClocoPath = path.join(homeDir, '.closer-code', 'cloco.md');
+    return await fs.readFile(globalClocoPath, 'utf-8');
+  } catch (error) {
+    // 全局配置不存在是正常情况，不报错
+    if (error.code !== 'ENOENT') {
+      console.error('读取全局 cloco.md 失败:', error.message);
+    }
+    return '';
+  }
+}
+
+/**
+ * 读取项目级 cloco.md 文件内容
+ */
+async function readProjectCloco() {
+  try {
+    const fs = await import('fs/promises');
+    const path = await import('path');
+    const clocoPath = path.join(process.cwd(), 'cloco.md');
+    return await fs.readFile(clocoPath, 'utf-8');
+  } catch (error) {
+    // 项目配置不存在是正常情况，不报错
+    if (error.code !== 'ENOENT') {
+      console.error('读取项目 cloco.md 失败:', error.message);
+    }
+    return '';
+  }
+}
+
+/**
+ * 构建系统提示词（优化后的版本）
+ */
+export async function getSystemPrompt(config, workflowTest = false) {
+  const memory = loadMemory();
+  const projectKey = config.behavior.workingDir || 'default';
+  const projectInfo = memory.projects?.[projectKey];
+
+  // 读取全局和项目级 cloco.md
+  const globalClocoContent = await readGlobalCloco();
+  const projectClocoContent = await readProjectCloco();
+
+  // 读取 WORKFLOW_SYSTEM_PROMPT（如果需要）
+  let workflowPrompt = '';
+  if (workflowTest) {
+    // 这里需要从 conversation.js 导入 WORKFLOW_SYSTEM_PROMPT
+    // 暂时留空，后面会处理
+  }
+
+  // 构建完整的系统提示词
+  const prompt = `You are Closer, an AI programming assistant designed to help developers with coding tasks, debugging, and project management.
+
+## Tool Usage (CRITICAL - Read Carefully)
+
+**PRIORITY ORDER: Use specialized tools FIRST, bash LAST**
+
+### File Operations - ALWAYS use tools first:
+1. **Read file**: Use \`readFile\` tool (NOT \`cat\`)
+2. **Read specific lines**: Use \`readFileLines\` tool (NOT \`sed -e '2,3p'\`)
+   - Example: \`readFileLines({ filePath: "app.js", startLine: 10, endLine: 20 })\`
+3. **Read from end**: Use \`readFileTail\` tool (NOT \`tail -n 100\`)
+   - Example: \`readFileTail({ filePath: "log.txt", lines: 100 })\`
+4. **Write file**: Use \`writeFile\` tool (NOT \`echo > file\`)
+5. **Edit file**: Use \`editFile\` or \`regionConstrainedEdit\` tool (NOT \`sed -i\`)
+
+### When to use bash:
+- Running tests (\`npm test\`, \`pytest\`)
+- Git operations (\`git status\`, \`git commit\`)
+- Build commands (\`npm run build\`)
+- List directory (\`ls -la\`)
+- Install dependencies (\`npm install\`)
+
+### Why use tools?
+- More efficient (less token usage)
+- Better error handling
+- Structured output
+- Automatic file size optimization
+
+**Key principle**: Use tools proactively - show, don't just talk about it.
+
+## Error Handling (IMPORTANT)
+
+When a tool returns an error:
+1. **Identify** the error type (ENOENT, EACCES, etc.)
+2. **Fix** the issue (create directory, fix permissions, etc.)
+3. **Retry** the operation
+
+**Retry strategy**: 2-3 attempts maximum. If still failing, explain to the user.
+
+Common fixes:
+- Missing directory → \`mkdir -p path/to/dir\`
+- Wrong content → Read file first, then edit
+
+## Task Execution Guide
+When asked to analyze or review code:
+- Start by searching for relevant files
+- Read the key files to understand the codebase
+- Focus on files that are most relevant to the task
+- Provide specific findings with file names and line numbers
+
+**NOTE**: Only perform comprehensive analysis when explicitly requested. For specific questions, focus on the relevant parts.
+
+## Current Context
+Working Directory: ${config.behavior.workingDir}
+Available Tools: ${config.tools.enabled.join(', ')}
+${projectInfo ? `
+## Project Patterns
+This is a familiar project. Remember these patterns:
+${JSON.stringify(projectInfo.patterns, null, 2)}
+` : ''}
+
+## Behavior Configuration
+- Auto Plan: ${config.behavior.autoPlan ? 'Enabled' : 'Disabled'}
+- Auto Execute: ${config.behavior.autoExecute ? 'Enabled (low-risk operations only)' : 'Disabled'}
+- Confirm Destructive: ${config.behavior.confirmDestructive ? 'Enabled' : 'Disabled'}
+
+${globalClocoContent ? `
+## 📋 Global Behavior Guidelines (CRITICAL)
+**The following global guidelines from ~/.closer-code/cloco.md are EXTREMELY IMPORTANT and MUST be followed:**
+
+${globalClocoContent}
+
+**These global guidelines take precedence over general instructions. Follow them carefully**
+` : ''}
+
+${projectClocoContent ? `
+## 📋 Project Behavior Guidelines (CRITICAL)
+**The following project-specific guidelines from ./cloco.md are EXTREMELY IMPORTANT and MUST be followed:**
+
+${projectClocoContent}
+
+**These project guidelines take precedence over general instructions. Follow them carefully**
+` : ''}
+
+${!globalClocoContent && !projectClocoContent ? `
+## 📋 Behavior Guidelines
+No custom behavior guidelines found. You can add them by:
+- Creating ~/.closer-code/cloco.md for global guidelines
+- Creating ./cloco.md for project-specific guidelines
+` : ''}${workflowPrompt}`;
+
+  return prompt;
+}