mcp-osp-prompt 1.0.2 → 1.0.4

package/dialog/native.js

@@ -1,6 +1,32 @@
 import os from 'os';
-import { execSync } from 'child_process';
+import { execSync, exec } from 'child_process';
+import { promisify } from 'util';
 import { escapeAppleScriptString } from './utils.js';
+
+// 使用 promisify 将 exec 转为 Promise 版本，避免阻塞事件循环
+const execAsync = promisify(exec);
+
+// 🔧 JSON-RPC 心跳函数：通过 stdout 发送 notification，防止 MCP 客户端超时
+let heartbeatCounter = 0;
+function sendHeartbeat(context = 'dialog') {
+  heartbeatCounter++;
+  
+  // 尝试使用 MCP 标准的 progress notification 格式
+  const notification = {
+    jsonrpc: '2.0',
+    method: 'notifications/progress',
+    params: {
+      progressToken: `heartbeat-${Date.now()}`,
+      progress: heartbeatCounter,
+      total: -1  // -1 表示未知总数
+    }
+  };
+  
+  // 写入 stdout，这是 MCP 客户端监听的通道
+  process.stdout.write(JSON.stringify(notification) + '\n');
+  // 同时写入 stderr 供调试（只保留一行日志）
+  console.error(`[Heartbeat #${heartbeatCounter}] progress notification sent`);
+}
 // 🟢 GREEN: Task 2.2 - 导入CFG配置用于native弹窗宽度设置
 import { CFG } from '../config.js';
 // ✅ UNIFIED: 导入统一的按钮管理常量
@@ -63,16 +89,21 @@ export async function showInputDialog({ title = '输入', message = '请输入
         end if
       `;
       
-      // 🆕 添加保活机制
+      // 🆕 添加保活机制（5秒间隔，通过 stdout 发送 JSON-RPC notification）
       const keepAliveInterval = setInterval(() => {
-        console.error('[Dialog-KeepAlive] Waiting for user input in textarea...');
-      }, 15000);
+        sendHeartbeat('input');
+      }, 5000);
       
       try {
-        const result = execSync(`osascript -e '${applescript}'`, { 
+        console.error('[Dialog] Calling osascript for input dialog with async exec (non-blocking)...');
+        
+        // 🔧 关键修改：使用异步 exec 替代 execSync，避免阻塞事件循环
+        const { stdout } = await execAsync(`osascript -e '${applescript}'`, { 
           encoding: 'utf8',
-          timeout: 1800000  // 30 minutes timeout (用户要求增加timeout)
-        }).trim();
+          timeout: 1800000  // 30 minutes timeout
+        });
+        
+        const result = stdout.trim();
         
         clearInterval(keepAliveInterval); // 清理定时器
 
@@ -159,13 +190,13 @@ export async function showConfirmDialog({ title = '确认', message = '请选择
 
   const platform = os.platform();
   
-  // 🆕 添加保活机制
+  // 🆕 添加保活机制（5秒间隔，通过 stdout 发送 JSON-RPC notification）
   const keepAliveInterval = setInterval(() => {
-    console.error('[Dialog-KeepAlive] Waiting for user to select button...');
-  }, 15000);
+    sendHeartbeat('button selection');
+  }, 5000);
   
   try {
-    let command, args;
+    let result;
     if (platform === 'darwin') {
       // Use enhanced escaping for all text content to handle special characters safely
       const safeTitle = escapeAppleScriptString(title).trim() || 'Confirmation';
@@ -183,31 +214,31 @@ export async function showConfirmDialog({ title = '确认', message = '请选择
       const buttonsList = safeButtons.map(b => `"${b}"`).join(', ');
       const script = `set selectedButton to button returned of (display dialog "${safeMessage}" with title "${safeTitle}" buttons {${buttonsList}} default button "${safeButtons[0]}")`;
       
-      // Removed: DEBUG logs with array/object output (causes JSON parse errors in MCP client)
+      console.error('[Dialog] Calling osascript with async exec (non-blocking)...');
       
-      const result = execSync(`osascript -e '${script}'`, { 
+      // 🔧 关键修改：使用异步 exec 替代 execSync，避免阻塞事件循环
+      const { stdout } = await execAsync(`osascript -e '${script}'`, { 
         encoding: 'utf8', 
-        timeout: 1800000,  // 30 minutes timeout (用户要求增加timeout)
-        stdio: ['pipe', 'pipe', 'pipe']
+        timeout: 3600000  // 60 minutes timeout
       });
       
       clearInterval(keepAliveInterval); // 清理定时器
       
-      const selectedButton = result.trim();
+      const selectedButton = stdout.trim();
       
       // Map safe button back to original button
       const safeIndex = safeButtons.indexOf(selectedButton);
       return safeIndex >= 0 ? buttons[safeIndex] : buttons[0];
 
     } else {
-      // Linux zenity
+      // Linux zenity - 也改为异步
       console.log('🐧 [ZENITY] Showing dialog...');
-      const result = execSync(`zenity --question --title="${title}" --text="${message}" --ok-label="${buttons[0]}" --cancel-label="${buttons[1]}"`, { 
+      const { stdout } = await execAsync(`zenity --question --title="${title}" --text="${message}" --ok-label="${buttons[0]}" --cancel-label="${buttons[1]}"`, { 
         encoding: 'utf8', 
-        timeout: 300000 
+        timeout: 3600000  // 60 minutes timeout
       });
       clearInterval(keepAliveInterval); // 清理定时器
-      return result.trim() || buttons[0];
+      return stdout.trim() || buttons[0];
     }
   } catch (error) {
     clearInterval(keepAliveInterval); // 出错时也要清理

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-osp-prompt",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "MCP server for fetching and caching prompt templates from GitHub, GitLab, or local directories",
   "main": "server.js",
   "bin": {

package/prompt-manager.js

@@ -308,6 +308,22 @@ class PromptManager {
           },
           required: ['random_string']
         }
+      },
+      {
+        name: 'gitlab-mr-fetch',
+        type: 'handler',
+        handler: 'handleGitlabMrFetch',
+        description: 'Fetch GitLab Merge Request details and code diff',
+        schema: {
+          type: 'object',
+          properties: {
+            mr_url: { 
+              type: 'string',
+              description: 'GitLab Merge Request URL, e.g., https://gitlab.com/group/project/-/merge_requests/123'
+            }
+          },
+          required: ['mr_url']
+        }
       }
     ];
 

package/server.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import process from 'process';
 import { initializePrompts, getToolsConfiguration } from './prompt-manager.js';
-import { handleDevTool, handleDevManual, handleDevFeedback } from './tools.js';
+import { handleDevTool, handleDevManual, handleDevFeedback, handleGitlabMrFetch } from './tools.js';
 import { CFG } from './config.js';
 import { 
   createSuccessResponse, 
@@ -64,10 +64,10 @@ async function initializeServerSync() {
   try {
     console.error('[MCP-Server] Starting synchronous initialization...');
     
-    // 每10秒输出一次日志，保持连接活跃
+    // 每5秒输出一次日志，保持连接活跃（防止客户端超时）
     keepAliveInterval = setInterval(() => {
-      console.error('[MCP-KeepAlive] Initializing tools, please wait...');
-    }, 10000);
+      console.error('[MCP-KeepAlive] I\'m alive, Heartbeat, Heartbeat...');
+    }, 5000);
     
     // 同步初始化prompt管理器
     globalToolsConfig = await initializePrompts();
@@ -233,6 +233,9 @@ async function handleToolCall(req) {
 ⚠️ **MANDATORY NEXT STEP REMINDER:** 在完成下一个实施步骤后，必须再次调用dev-feedback工具汇报进度并获取确认。每个步骤完成后都需要调用feedback工具 - 这是强制要求！`;
           }
           break;
+        case 'handleGitlabMrFetch':
+          resultText = await handleGitlabMrFetch(args);
+          break;
         default:
           throw new Error(`Unknown handler: ${tool.handler}`);
       }

package/tools.js

@@ -3,6 +3,7 @@ import { getToolsConfiguration, getLocalPromptInfo } from './prompt-manager.js';
 import { showInputDialog, showConfirmDialog, showSelectDialog, showPlanAdjustmentDialog } from './dialog/index.js';
 // ✅ UNIFIED: 导入统一的按钮管理常量
 import { BASE_DIALOG_BUTTONS, getSafeButtons, getStandardButtons } from './dialog/constants.js';
+import { createAuthHeaders } from './platform-utils.js';
 
 // 动态获取工具的source映射
 function getToolSource(toolName) {
@@ -478,12 +479,17 @@ export async function handleDevManual() {
 }
 
 export async function handleDevFeedback(args) {
+  console.error('[DEBUG] handleDevFeedback called with args:', JSON.stringify(args, null, 2));
+  
   // Support both old simple format and new enhanced format
   if (args.phase || args.context || args.allowPlanAdjustment) {
+    console.error('[DEBUG] Taking enhanced feedback branch');
     // Use enhanced feedback for new format
     return await enhancedDevFeedback(args);
   }
   
+  console.error('[DEBUG] Taking legacy feedback branch');
+  
   // Legacy support for old format
   const { title, message, options = [] } = args;
   if (process.env.AUTOMATED_MODE === 'true') {
@@ -495,10 +501,7 @@ export async function handleDevFeedback(args) {
   // 简化逻辑：直接传入options，函数内部自动判断场景
   const finalOptions = getStandardButtons(options.length > 0 ? options : null);
   
-  // 🆕 添加保活机制：在等待用户交互期间定期输出日志
-  const keepAliveInterval = setInterval(() => {
-    console.error('[MCP-KeepAlive] Waiting for user dialog interaction...');
-  }, 15000);
+  console.error('[DEBUG] Calling showConfirmDialog (heartbeat is handled in native.js)...');
   
   try {
     const result = await showConfirmDialog({ 
@@ -507,8 +510,6 @@ export async function handleDevFeedback(args) {
       buttons: finalOptions
     });
     
-    clearInterval(keepAliveInterval); // 用户选择后清理定时器
-    
     // If user selects a "modify" option, automatically show input dialog
     if (result && (result.includes('修改') || result.includes('调整') || result.includes('建议'))) {
       
@@ -530,7 +531,6 @@ export async function handleDevFeedback(args) {
     }
     return result;
   } catch (error) {
-    clearInterval(keepAliveInterval); // 出错时也要清理定时器
     console.error('❌ [FEEDBACK ERROR]:', error.message);
     
     // Check if this is a dialog system failure
@@ -565,4 +565,127 @@ export async function handleDevFeedback(args) {
 }
 
 // handleDevReload removed - configuration now loads automatically from environment and mcp.json
-// No manual reload needed as per user requirements
+// No manual reload needed as per user requirements
+
+/**
+ * Parse GitLab MR URL to extract project and MR IID
+ * @param {string} mrUrl - GitLab MR URL
+ * @returns {object} Parsed info { projectPath, mrIid, apiBase }
+ */
+function parseGitlabMrUrl(mrUrl) {
+  // Match: https://gitlab.com/group/project/-/merge_requests/123
+  // Or: https://gitlab.example.com/group/subgroup/project/-/merge_requests/123
+  const match = mrUrl.match(/^(https?:\/\/[^\/]+)\/(.+?)\/-\/merge_requests\/(\d+)/);
+  
+  if (!match) {
+    throw new Error(`Invalid GitLab MR URL format: ${mrUrl}. Expected format: https://gitlab.com/group/project/-/merge_requests/123`);
+  }
+  
+  return {
+    apiBase: match[1],
+    projectPath: match[2],
+    mrIid: match[3]
+  };
+}
+
+/**
+ * Fetch GitLab Merge Request details and code diff
+ * @param {object} args - Arguments with mr_url
+ * @returns {string} Formatted MR information with diffs
+ */
+export async function handleGitlabMrFetch(args) {
+  const { mr_url } = args;
+  
+  if (!mr_url) {
+    throw new Error('mr_url is required');
+  }
+  
+  const token = process.env.GIT_TOKEN;
+  if (!token) {
+    throw new Error('GIT_TOKEN environment variable is required for GitLab API access');
+  }
+  
+  const { apiBase, projectPath, mrIid } = parseGitlabMrUrl(mr_url);
+  const projectEnc = encodeURIComponent(projectPath);
+  const headers = createAuthHeaders('gitlab', token);
+  
+  console.error(`[GitLab MR] Fetching MR ${mrIid} from ${projectPath}`);
+  
+  try {
+    // Fetch MR details
+    const mrResponse = await fetch(
+      `${apiBase}/api/v4/projects/${projectEnc}/merge_requests/${mrIid}`,
+      { headers }
+    );
+    
+    if (!mrResponse.ok) {
+      const errorText = await mrResponse.text();
+      throw new Error(`GitLab API error (${mrResponse.status}): ${errorText}`);
+    }
+    
+    const mrData = await mrResponse.json();
+    
+    // Fetch MR changes (diffs)
+    const changesResponse = await fetch(
+      `${apiBase}/api/v4/projects/${projectEnc}/merge_requests/${mrIid}/changes`,
+      { headers }
+    );
+    
+    if (!changesResponse.ok) {
+      const errorText = await changesResponse.text();
+      throw new Error(`GitLab API error fetching changes (${changesResponse.status}): ${errorText}`);
+    }
+    
+    const changesData = await changesResponse.json();
+    
+    // Format the output
+    let output = `# GitLab Merge Request Details
+
+## Basic Information
+- **Title:** ${mrData.title}
+- **MR IID:** !${mrData.iid}
+- **Author:** ${mrData.author?.name || 'Unknown'} (@${mrData.author?.username || 'unknown'})
+- **Source Branch:** ${mrData.source_branch}
+- **Target Branch:** ${mrData.target_branch}
+- **State:** ${mrData.state}
+- **Created At:** ${mrData.created_at}
+- **Updated At:** ${mrData.updated_at}
+- **URL:** ${mr_url}
+
+## Description
+${mrData.description || '_No description provided_'}
+
+## Changed Files (${changesData.changes?.length || 0} files)
+
+`;
+    
+    // Add file changes
+    if (changesData.changes && changesData.changes.length > 0) {
+      for (const change of changesData.changes) {
+        const status = change.new_file ? '🆕 New' : 
+                       change.deleted_file ? '🗑️ Deleted' : 
+                       change.renamed_file ? '📝 Renamed' : '✏️ Modified';
+        
+        output += `### ${status}: \`${change.new_path}\`\n`;
+        
+        if (change.renamed_file && change.old_path !== change.new_path) {
+          output += `_Renamed from: ${change.old_path}_\n`;
+        }
+        
+        output += '\n```diff\n';
+        output += change.diff || '_Binary file or no diff available_';
+        output += '\n```\n\n';
+      }
+    } else {
+      output += '_No changes found_\n';
+    }
+    
+    console.error(`[GitLab MR] Successfully fetched MR with ${changesData.changes?.length || 0} changed files`);
+    
+    return output;
+    
+  } catch (error) {
+    console.error(`[GitLab MR] Error:`, error.message);
+    throw error;
+  }
+}