mcp-feedback-enhanced 0.1.55 → 0.1.65

package/dist/index.js

@@ -16,7 +16,9 @@ import * as os from 'os';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as net from 'net';
+import * as http from 'http';
 import { createRequire } from 'module';
+import { exec } from 'child_process';
 // Read version from package.json (ES module compatible)
 const require = createRequire(import.meta.url);
 const packageJson = require('../package.json');
@@ -173,13 +175,29 @@ async function findExtensionForProjectAsync(projectPath) {
     if (servers.length === 0) {
         return null;
     }
-    // Strategy 1: Exact workspace match
-    for (const server of servers) {
-        if (server.workspaces?.includes(projectPath)) {
-            debug(`✓ Exact workspace match: port=${server.port}`);
-            return server;
+    // Get MCP server's CURSOR_TRACE_ID (if running in Cursor)
+    const myTraceId = process.env['CURSOR_TRACE_ID'] || '';
+    debug(`My CURSOR_TRACE_ID: ${myTraceId || '(not set)'}`);
+    // Strategy 0: CURSOR_TRACE_ID match (HIGHEST PRIORITY - same Cursor window)
+    if (myTraceId) {
+        const traceMatch = servers.find(s => s.cursorTraceId === myTraceId);
+        if (traceMatch) {
+            debug(`✓ CURSOR_TRACE_ID match: port=${traceMatch.port}, traceId=${myTraceId}`);
+            return traceMatch;
         }
     }
+    // Strategy 1: Exact workspace match + traceId filter if available
+    const workspaceMatches = servers.filter(s => s.workspaces?.includes(projectPath));
+    if (workspaceMatches.length === 1) {
+        debug(`✓ Exact workspace match (single): port=${workspaceMatches[0].port}`);
+        return workspaceMatches[0];
+    }
+    if (workspaceMatches.length > 1) {
+        // Multiple windows have this workspace - take most recent
+        const sorted = workspaceMatches.sort((a, b) => b.timestamp - a.timestamp);
+        debug(`✓ Exact workspace match (multiple, taking most recent): port=${sorted[0].port}`);
+        return sorted[0];
+    }
     // Strategy 2: Prefix match (project is inside a workspace)
     for (const server of servers) {
         for (const ws of server.workspaces || []) {
@@ -206,7 +224,7 @@ async function findExtensionForProjectAsync(projectPath) {
     debug(`✓ Using most recent server: port=${sorted[0].port}`);
     debug(`  Available servers:`);
     sorted.forEach(s => {
-        debug(`    - pid=${s.pid}, port=${s.port}, workspaces=${s.workspaces?.join(', ')}`);
+        debug(`    - pid=${s.pid}, port=${s.port}, traceId=${s.cursorTraceId}, workspaces=${s.workspaces?.join(', ')}`);
     });
     return sorted[0];
 }
@@ -217,11 +235,19 @@ function findExtensionForProject(projectPath) {
     const servers = getLiveServers();
     if (servers.length === 0)
         return null;
-    // Same matching logic but sync
-    for (const server of servers) {
-        if (server.workspaces?.includes(projectPath))
-            return server;
+    // Strategy 0: CURSOR_TRACE_ID match (highest priority)
+    const myTraceId = process.env['CURSOR_TRACE_ID'] || '';
+    if (myTraceId) {
+        const traceMatch = servers.find(s => s.cursorTraceId === myTraceId);
+        if (traceMatch)
+            return traceMatch;
+    }
+    // Strategy 1: Exact workspace match
+    const workspaceMatches = servers.filter(s => s.workspaces?.includes(projectPath));
+    if (workspaceMatches.length >= 1) {
+        return workspaceMatches.sort((a, b) => b.timestamp - a.timestamp)[0];
     }
+    // Strategy 2: Prefix match
     for (const server of servers) {
         for (const ws of server.workspaces || []) {
             if (projectPath.startsWith(ws + path.sep) || ws.startsWith(projectPath + path.sep)) {
@@ -229,9 +255,11 @@ function findExtensionForProject(projectPath) {
             }
         }
     }
+    // Strategy 3: parentPid match
     const parentMatch = servers.find(s => s.parentPid === process.ppid);
     if (parentMatch)
         return parentMatch;
+    // Fallbacks
     if (servers.length === 1)
         return servers[0];
     return servers.sort((a, b) => b.timestamp - a.timestamp)[0];
@@ -388,9 +416,18 @@ function handleMessage(message) {
 }
 /**
  * Request feedback from user via Extension
+ * Falls back to browser if extension is not available
  */
 async function requestFeedback(projectDirectory, summary, timeout, agentName) {
-    await ensureConnectedForProject(projectDirectory);
+    // Try to connect to extension first
+    try {
+        await ensureConnectedForProject(projectDirectory);
+    }
+    catch (e) {
+        // Extension not available, fall back to browser
+        debug(`Extension not available, falling back to browser: ${e.message}`);
+        return requestFeedbackViaBrowser(projectDirectory, summary, timeout);
+    }
     const sessionId = `session_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
     return new Promise((resolve, reject) => {
         // Set timeout
@@ -417,6 +454,303 @@ async function requestFeedback(projectDirectory, summary, timeout, agentName) {
     });
 }
 // ============================================================================
+// Browser Fallback
+// ============================================================================
+/**
+ * Open system default browser
+ */
+function openBrowser(url) {
+    const platform = os.platform();
+    let cmd;
+    if (platform === 'darwin') {
+        cmd = `open "${url}"`;
+    }
+    else if (platform === 'win32') {
+        cmd = `start "" "${url}"`;
+    }
+    else {
+        cmd = `xdg-open "${url}"`;
+    }
+    exec(cmd, (error) => {
+        if (error) {
+            debug(`Failed to open browser: ${error.message}`);
+        }
+    });
+}
+/**
+ * Generate HTML page for browser feedback
+ */
+function generateBrowserHtml(summary, port) {
+    const escapedSummary = summary
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/\n/g, '<br>');
+    return `<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>MCP Feedback</title>
+    <style>
+        * { box-sizing: border-box; margin: 0; padding: 0; }
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+            background: #1e1e1e;
+            color: #d4d4d4;
+            min-height: 100vh;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            padding: 20px;
+        }
+        .container {
+            max-width: 800px;
+            width: 100%;
+            background: #252526;
+            border-radius: 12px;
+            box-shadow: 0 8px 32px rgba(0,0,0,0.3);
+            overflow: hidden;
+        }
+        .header {
+            background: #007acc;
+            padding: 16px 24px;
+            display: flex;
+            align-items: center;
+            gap: 12px;
+        }
+        .header h1 {
+            font-size: 18px;
+            font-weight: 600;
+            color: white;
+        }
+        .header .icon { font-size: 24px; }
+        .content { padding: 24px; }
+        .ai-message {
+            background: #2d2d2d;
+            border: 1px solid #3c3c3c;
+            border-radius: 8px;
+            padding: 16px;
+            margin-bottom: 20px;
+            max-height: 400px;
+            overflow-y: auto;
+            line-height: 1.6;
+        }
+        .label {
+            font-size: 12px;
+            color: #888;
+            margin-bottom: 8px;
+            display: flex;
+            align-items: center;
+            gap: 6px;
+        }
+        .quick-btns {
+            display: flex;
+            gap: 8px;
+            margin-bottom: 16px;
+            flex-wrap: wrap;
+        }
+        .quick-btn {
+            padding: 8px 16px;
+            background: transparent;
+            border: 1px solid #3c3c3c;
+            color: #d4d4d4;
+            border-radius: 20px;
+            cursor: pointer;
+            font-size: 13px;
+            transition: all 0.2s;
+        }
+        .quick-btn:hover {
+            background: #3c3c3c;
+            border-color: #569cd6;
+        }
+        textarea {
+            width: 100%;
+            min-height: 120px;
+            padding: 12px;
+            background: #2d2d2d;
+            border: 1px solid #3c3c3c;
+            border-radius: 8px;
+            color: #d4d4d4;
+            font-size: 14px;
+            font-family: inherit;
+            resize: vertical;
+            margin-bottom: 16px;
+        }
+        textarea:focus {
+            outline: none;
+            border-color: #007acc;
+        }
+        .submit-btn {
+            width: 100%;
+            padding: 14px;
+            background: #007acc;
+            border: none;
+            border-radius: 8px;
+            color: white;
+            font-size: 15px;
+            font-weight: 600;
+            cursor: pointer;
+            transition: background 0.2s;
+        }
+        .submit-btn:hover { background: #0098ff; }
+        .submit-btn:disabled {
+            background: #3c3c3c;
+            cursor: not-allowed;
+        }
+        .success {
+            text-align: center;
+            padding: 40px;
+        }
+        .success .icon { font-size: 48px; margin-bottom: 16px; }
+        .success h2 { color: #4ec9b0; margin-bottom: 8px; }
+        .success p { color: #888; }
+    </style>
+</head>
+<body>
+    <div class="container" id="feedbackForm">
+        <div class="header">
+            <span class="icon">💬</span>
+            <h1>MCP Feedback</h1>
+        </div>
+        <div class="content">
+            <div class="label">🤖 AI Summary</div>
+            <div class="ai-message">${escapedSummary}</div>
+            
+            <div class="label">💬 Your Feedback</div>
+            <div class="quick-btns">
+                <button class="quick-btn" onclick="setFeedback('Continue')">▶️ Continue</button>
+                <button class="quick-btn" onclick="setFeedback('Looks good')">👍 Good</button>
+                <button class="quick-btn" onclick="setFeedback('Please fix it')">🔧 Fix</button>
+                <button class="quick-btn" onclick="setFeedback('Stop')">⏹️ Stop</button>
+            </div>
+            <textarea id="feedback" placeholder="Type your feedback here..."></textarea>
+            <button class="submit-btn" id="submitBtn" onclick="submitFeedback()">Send Feedback</button>
+        </div>
+    </div>
+    
+    <div class="container" id="successMsg" style="display: none;">
+        <div class="success">
+            <div class="icon">✅</div>
+            <h2>Feedback Sent!</h2>
+            <p>You can close this window now.</p>
+        </div>
+    </div>
+    
+    <script>
+        function setFeedback(text) {
+            document.getElementById('feedback').value = text;
+        }
+        
+        async function submitFeedback() {
+            const feedback = document.getElementById('feedback').value.trim();
+            if (!feedback) {
+                alert('Please enter your feedback');
+                return;
+            }
+            
+            const btn = document.getElementById('submitBtn');
+            btn.disabled = true;
+            btn.textContent = 'Sending...';
+            
+            try {
+                const response = await fetch('/submit', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({ feedback })
+                });
+                
+                if (response.ok) {
+                    document.getElementById('feedbackForm').style.display = 'none';
+                    document.getElementById('successMsg').style.display = 'block';
+                } else {
+                    throw new Error('Submit failed');
+                }
+            } catch (e) {
+                btn.disabled = false;
+                btn.textContent = 'Send Feedback';
+                alert('Failed to send feedback. Please try again.');
+            }
+        }
+    </script>
+</body>
+</html>`;
+}
+/**
+ * Request feedback via browser (fallback when extension not available)
+ */
+async function requestFeedbackViaBrowser(projectDirectory, summary, timeout) {
+    return new Promise((resolve, reject) => {
+        // Find available port
+        const server = http.createServer();
+        server.listen(0, '127.0.0.1', () => {
+            const address = server.address();
+            if (!address || typeof address === 'string') {
+                reject(new Error('Failed to start HTTP server'));
+                return;
+            }
+            const port = address.port;
+            debug(`Browser feedback server started on port ${port}`);
+            let feedbackReceived = false;
+            // Handle requests
+            server.on('request', (req, res) => {
+                if (req.method === 'GET' && req.url === '/') {
+                    // Serve HTML page
+                    res.writeHead(200, { 'Content-Type': 'text/html' });
+                    res.end(generateBrowserHtml(summary, port));
+                }
+                else if (req.method === 'POST' && req.url === '/submit') {
+                    // Handle feedback submission
+                    let body = '';
+                    req.on('data', chunk => body += chunk);
+                    req.on('end', () => {
+                        try {
+                            const data = JSON.parse(body);
+                            feedbackReceived = true;
+                            res.writeHead(200, { 'Content-Type': 'application/json' });
+                            res.end(JSON.stringify({ success: true }));
+                            // Close server and resolve
+                            setTimeout(() => {
+                                server.close();
+                                resolve({
+                                    feedback: data.feedback || '',
+                                    images: []
+                                });
+                            }, 1000);
+                        }
+                        catch (e) {
+                            res.writeHead(400);
+                            res.end('Invalid request');
+                        }
+                    });
+                }
+                else {
+                    res.writeHead(404);
+                    res.end('Not found');
+                }
+            });
+            // Open browser
+            const url = `http://127.0.0.1:${port}`;
+            debug(`Opening browser: ${url}`);
+            openBrowser(url);
+            // Timeout
+            const timeoutHandle = setTimeout(() => {
+                if (!feedbackReceived) {
+                    server.close();
+                    reject(new Error(`Browser feedback timeout after ${timeout} seconds`));
+                }
+            }, timeout * 1000);
+            server.on('close', () => {
+                clearTimeout(timeoutHandle);
+            });
+        });
+        server.on('error', (err) => {
+            reject(new Error(`Failed to start browser feedback server: ${err.message}`));
+        });
+    });
+}
+// ============================================================================
 // MCP Server Setup
 // ============================================================================
 const server = new McpServer({
@@ -428,7 +762,7 @@ server.tool('interactive_feedback', 'Collect feedback from user through VSCode e
     project_directory: z.string().describe('The project directory path for context'),
     summary: z.string().describe('Summary of AI work completed for user review'),
     timeout: z.number().optional().default(600).describe('Timeout in seconds (default: 600)'),
-    agent_name: z.string().optional().describe('Display name for this agent/chat (e.g. "Chat 1", "Refactor Task")')
+    agent_name: z.string().optional().describe('Unique identifier for this agent/chat session. Use a stable name like the chat title or task description (e.g. "Chat 1", "Pre-credit Implementation", "Bug Fix #123"). If not provided, defaults to "Agent" and all messages will appear in the same tab. Providing a unique name allows multiple agents to have separate conversation tabs.')
 }, async ({ project_directory, summary, timeout, agent_name }) => {
     debug(`interactive_feedback called: project=${project_directory}, agent=${agent_name || 'default'}`);
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-feedback-enhanced",
-  "version": "0.1.55",
+  "version": "0.1.65",
   "description": "MCP Feedback Enhanced Server - Interactive feedback collection for AI assistants",
   "type": "module",
   "main": "dist/index.js",
@@ -17,11 +17,11 @@
     "vscode",
     "claude"
   ],
-  "author": "Minidoracat",
+  "author": "yuanming.chen",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Minidoracat/mcp-feedback-enhanced"
+    "url": "https://github.com/xxx/mcp-feedback-enhanced"
   },
   "scripts": {
     "build": "tsc",