@nbakka/mcp-appium 2.0.93 → 2.0.95

package/lib/review-ui/index.html

@@ -33,20 +33,11 @@
             padding-bottom: 10px;
             border-bottom: 2px solid;
         }
-        .new {
-            background-color: #e8f5e8;
-            border-color: #4caf50;
-        }
+        .new { background-color: #e8f5e8; border-color: #4caf50; }
         .new h2 { border-bottom-color: #4caf50; color: #2e7d32; }
-        .modify {
-            background-color: #fff8e1;
-            border-color: #ff9800;
-        }
+        .modify { background-color: #fff8e1; border-color: #ff9800; }
         .modify h2 { border-bottom-color: #ff9800; color: #f57c00; }
-        .remove {
-            background-color: #ffebee;
-            border-color: #f44336;
-        }
+        .remove { background-color: #ffebee; border-color: #f44336; }
         .remove h2 { border-bottom-color: #f44336; color: #c62828; }
         .test-case {
             margin: 15px 0;
@@ -75,35 +66,18 @@
             font-size: 0.85em;
             margin-left: 5px;
         }
-        .edit-btn {
-            background-color: #2196f3;
-            color: white;
-        }
-        .save-btn {
-            background-color: #4caf50;
-            color: white;
-        }
-        .cancel-btn-inline {
-            background-color: #757575;
-            color: white;
-        }
-        .delete-btn {
-            background-color: #f44336;
-            color: white;
-        }
-        .delete-btn:hover {
-            background-color: #d32f2f;
-        }
+        .edit-btn { background-color: #2196f3; color: white; }
+        .save-btn { background-color: #4caf50; color: white; }
+        .cancel-btn-inline { background-color: #757575; color: white; }
+        .delete-btn { background-color: #f44336; color: white; }
+        .delete-btn:hover { background-color: #d32f2f; }
         .original-text {
             color: #999;
             text-decoration: line-through;
             font-style: italic;
             margin-bottom: 10px;
         }
-        .modified-text {
-            color: #000;
-            font-weight: 500;
-        }
+        .modified-text { color: #000; font-weight: 500; }
         .editable-area {
             width: 100%;
             min-height: 60px;
@@ -114,10 +88,7 @@
             font-size: 14px;
             resize: vertical;
         }
-        .editable-area:focus {
-            outline: none;
-            border-color: #2196f3;
-        }
+        .editable-area:focus { outline: none; border-color: #2196f3; }
         .button-container {
             text-align: center;
             margin-top: 40px;
@@ -136,22 +107,10 @@
             letter-spacing: 0.5px;
             transition: all 0.3s ease;
         }
-        .approve {
-            background-color: #4caf50;
-            color: white;
-        }
-        .approve:hover {
-            background-color: #45a049;
-            transform: translateY(-2px);
-        }
-        .cancel {
-            background-color: #f44336;
-            color: white;
-        }
-        .cancel:hover {
-            background-color: #da190b;
-            transform: translateY(-2px);
-        }
+        .approve { background-color: #4caf50; color: white; }
+        .approve:hover { background-color: #45a049; transform: translateY(-2px); }
+        .cancel { background-color: #f44336; color: white; }
+        .cancel:hover { background-color: #da190b; transform: translateY(-2px); }
         .status {
             margin-top: 20px;
             padding: 15px;
@@ -203,22 +162,18 @@
 
 <script>
     let sessionId;
-    let testCases;
+    let testCases = { new: [], modify: [], remove: [] };
     let editingStates = {};
 
     async function loadTestCases() {
         try {
             const response = await fetch('/api/testcases');
-            if (!response.ok) {
-                throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-            }
+            if (!response.ok) throw new Error(`HTTP ${response.status}: ${response.statusText}`);
             const data = await response.json();
             sessionId = data.sessionId;
             testCases = data.testCases;
-
             document.getElementById('loading').style.display = 'none';
             document.getElementById('content').style.display = 'block';
-
             renderTestCases();
         } catch (error) {
             document.getElementById('loading').innerHTML = `<div class="status error">Error loading test cases: ${error.message}</div>`;
@@ -297,7 +252,7 @@
     function renderRemoveCases() {
         const container = document.getElementById('remove-cases');
         if (testCases.remove && testCases.remove.length > 0) {
-            container.innerHTML = testCases.remove.map((tc, index) => `
+            container.innerHTML = testCases.remove.map(tc => `
                 <div class="test-case">
                     <div class="test-case-header">
                         <span class="test-case-id">ID: ${tc.id}</span>
@@ -318,8 +273,7 @@
     function toggleEdit(type, index) {
         const displayDiv = document.getElementById(`${type}-${index}-display`);
         const editDiv = document.getElementById(`${type}-${index}-edit`);
-
-        if (displayDiv.style.display === 'block') {
+        if (displayDiv && editDiv && displayDiv.style.display === 'block') {
             displayDiv.style.display = 'none';
             editDiv.style.display = 'block';
             editingStates[`${type}-${index}`] = true;
@@ -329,16 +283,11 @@
     function saveEdit(type, index) {
         if (type === 'new') {
             const newDesc = document.getElementById(`new-${index}-desc`).value.trim();
-            if (newDesc) {
-                testCases.new[index].description = newDesc;
-            }
+            if (newDesc) testCases.new[index].description = newDesc;
         } else if (type === 'modify') {
             const newMod = document.getElementById(`modify-${index}-mod`).value.trim();
-            if (newMod) {
-                testCases.modify[index].modified = newMod;
-            }
+            if (newMod) testCases.modify[index].modified = newMod;
         }
-
         cancelEdit(type, index);
         renderTestCases();
         showStatus('Changes saved successfully!', 'success');
@@ -347,10 +296,11 @@
     function cancelEdit(type, index) {
         const displayDiv = document.getElementById(`${type}-${index}-display`);
         const editDiv = document.getElementById(`${type}-${index}-edit`);
-
-        displayDiv.style.display = 'block';
-        editDiv.style.display = 'none';
-        delete editingStates[`${type}-${index}`];
+        if (displayDiv && editDiv) {
+            displayDiv.style.display = 'block';
+            editDiv.style.display = 'none';
+            delete editingStates[`${type}-${index}`];
+        }
     }
 
     function showStatus(message, type) {
@@ -358,10 +308,35 @@
         statusDiv.textContent = message;
         statusDiv.className = `status ${type}`;
         statusDiv.style.display = 'block';
+        setTimeout(() => { statusDiv.style.display = 'none'; }, 3000);
+    }
 
-        setTimeout(() => {
-            statusDiv.style.display = 'none';
-        }, 3000);
+    async function deleteTestCase(type, index) {
+        if (!['new', 'modify'].includes(type)) return;
+        const confirmation = confirm("Are you sure you want to delete this test case?");
+        if (!confirmation) return;
+        const item = testCases[type][index];
+        if (!item) return;
+        try {
+            showStatus('Deleting test case...', 'info');
+            const response = await fetch(`/delete/${sessionId}`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ type, id: item.id })
+            });
+            if (!response.ok) throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+            const updated = await response.json();
+            if (updated.testCases) {
+                testCases = updated.testCases;
+            } else {
+                // fallback local update
+                testCases[type] = testCases[type].filter(tc => tc.id !== item.id);
+            }
+            renderTestCases();
+            showStatus('Test case deleted successfully!', 'success');
+        } catch (error) {
+            showStatus(`Error deleting test case: ${error.message}`, 'error');
+        }
     }
 
     async function approveTestCases() {
@@ -372,17 +347,10 @@
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify(testCases)
             });
-
-            if (!response.ok) {
-                throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-            }
-
+            if (!response.ok) throw new Error(`HTTP ${response.status}: ${response.statusText}`);
             const result = await response.json();
             showStatus(result.message || 'Test cases approved successfully!', 'success');
-
-            setTimeout(() => {
-                window.close();
-            }, 2000);
+            setTimeout(() => window.close(), 1200);
         } catch (error) {
             showStatus(`Error approving test cases: ${error.message}`, 'error');
         }
@@ -391,58 +359,17 @@
     async function cancelReview() {
         try {
             showStatus('Cancelling review...', 'info');
-            const response = await fetch(`/cancel/${sessionId}`, {
-                method: 'POST'
-            });
-
-            if (!response.ok) {
-                throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-            }
-
+            const response = await fetch(`/cancel/${sessionId}`, { method: 'POST' });
+            if (!response.ok) throw new Error(`HTTP ${response.status}: ${response.statusText}`);
             const result = await response.json();
             showStatus(result.message || 'Review cancelled', 'info');
-
-            setTimeout(() => {
-                window.close();
-            }, 2000);
+            setTimeout(() => window.close(), 1500);
         } catch (error) {
             showStatus(`Error cancelling review: ${error.message}`, 'error');
         }
     }
 
-async function deleteTestCase(type, index) {
-    const confirmation = confirm("Are you sure you want to delete this test case?");
-    if (!confirmation) return;
-
-    try {
-        showStatus('Deleting test case...', 'info');
-        const response = await fetch(`/delete/${sessionId}`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ type, index })
-        });
-
-        if (!response.ok) {
-            throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-        }
-
-        // Remove the deleted test case from the local state first
-        if (type === 'new') {
-            testCases.new.splice(index, 1);
-        } else if (type === 'modify') {
-            testCases.modify.splice(index, 1);
-        }
-
-        // Re-render the UI to update indexes and remove the element
-        renderTestCases();
-        showStatus('Test case deleted successfully!', 'success');
-    } catch (error) {
-        showStatus(`Error deleting test case: ${error.message}`, 'error');
-    }
-}
-
-    // Load test cases when page loads
     window.onload = loadTestCases;
 </script>
 </body>
-</html>
+</html>

package/lib/server.js

@@ -798,219 +798,177 @@ tool(
 let approvalSessions = new Map();
 
 tool(
-    "review_testcases",
-    "Open test cases in browser for manual approval.",
-    {
-        testCases: zod_1.z.array(zod_1.z.array(zod_1.z.string())).describe("test cases array generated by tool generate_testcases_from_ticket_data")
-    },
-    async ({ testCases }) => {
-        try {
-            const express = require('express');
-            const path = require('path');
-            const sessionId = Date.now().toString();
-
-            // Add the improved parseTestCases function here
-            function parseTestCases(testCasesArray) {
-                const parsed = {
-                    new: [],
-                    modify: [],
-                    remove: []
-                };
-
-                testCasesArray.forEach(tc => {
-                    if (tc.length === 4 && tc[2] === 'Modify') {
-                        // Modify: [original, modified, "Modify", tcmsId]
-                        parsed.modify.push({
-                            id: tc[3],
-                            original: tc[0],
-                            modified: tc[1]
-                        });
-                    } else if (tc.length === 3 && tc[1] === 'Remove') {
-                        // Remove: [description, "Remove", tcmsId]
-                        parsed.remove.push({
-                            id: tc[2],
-                            description: tc[0]
-                        });
-                    } else if (tc.length === 2 && tc[1] === 'New') {
-                        // New: [description, "New"]
-                        parsed.new.push({
-                            description: tc[0],
-                            id: `NEW-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`
-                        });
-                    }
-                });
-
-                return parsed;
-            }
-
-            // Use the improved parsing function
-            const parsedTestCases = parseTestCases(testCases);
-
-            // Remove the old parsing logic and console.log statements that cause JSON errors
-            // Initialize session state
-            approvalSessions.set(sessionId, {
-                status: 'pending',
-                testCases: parsedTestCases,
-                originalTestCases: JSON.parse(JSON.stringify(parsedTestCases)),
-                server: null,
-                startTime: Date.now()
+  "review_testcases",
+  "Open test cases in browser for manual approval.",
+  {
+    testCases: zod_1.z
+      .array(zod_1.z.array(zod_1.z.string()))
+      .describe("test cases array generated by tool generate_testcases_from_ticket_data")
+  },
+  async ({ testCases }) => {
+    try {
+      const sessionId = Date.now().toString();
+
+      function parseTestCases(testCasesArray) {
+        const parsed = { new: [], modify: [], remove: [] };
+        testCasesArray.forEach(tc => {
+          if (tc.length === 4 && tc[2] === 'Modify') {
+            parsed.modify.push({ id: tc[3], original: tc[0], modified: tc[1] });
+          } else if (tc.length === 3 && tc[1] === 'Remove') {
+            parsed.remove.push({ id: tc[2], description: tc[0] });
+          } else if (tc.length === 2 && tc[1] === 'New') {
+            parsed.new.push({
+              description: tc[0],
+              id: `NEW-${Date.now()}-${Math.random().toString(36).slice(2)}`
             });
+          }
+        });
+        return parsed;
+      }
 
-            const app = express();
-            const port = 3001;
-
-            app.use(express.json());
-            app.use(express.static(path.join(__dirname, 'review-ui')));
-
-            app.get("/", (req, res) => {
-                res.sendFile(path.join(__dirname, 'review-ui', 'index.html'));
-            });
+      const parsedTestCases = parseTestCases(testCases);
 
-            app.get("/api/testcases", (req, res) => {
-                const session = approvalSessions.get(sessionId);
-                if (!session) {
-                    return res.status(404).json({ error: 'Session not found' });
-                }
-                res.json({
-                    sessionId: sessionId,
-                    testCases: session.testCases
-                });
-            });
-
-            app.post(`/approve/${sessionId}`, (req, res) => {
-                const session = approvalSessions.get(sessionId);
-                if (session) {
-                    session.status = 'approved';
-                    session.finalTestCases = req.body;
-                    approvalSessions.set(sessionId, session);
-                }
-                res.json({ status: 'approved', message: 'Test cases approved successfully!' });
-            });
+      approvalSessions.set(sessionId, {
+        status: 'pending',
+        testCases: parsedTestCases,
+        originalTestCases: JSON.parse(JSON.stringify(parsedTestCases)),
+        server: null,
+        startTime: Date.now()
+      });
 
-            app.post(`/cancel/${sessionId}`, (req, res) => {
-                const session = approvalSessions.get(sessionId);
-                if (session) {
-                    session.status = 'cancelled';
-                    approvalSessions.set(sessionId, session);
-                }
-                res.json({ status: 'cancelled', message: 'Review cancelled' });
-            });
+      const app = express();
+      const port = 3001;
 
-            app.post(`/delete/${sessionId}`, (req, res) => {
-                const session = approvalSessions.get(sessionId);
-                if (!session) {
-                    return res.status(404).json({ error: 'Session not found' });
-                }
+      app.use(express.json());
+      app.use(express.static(path.join(__dirname, 'review-ui')));
 
-                const { type, index } = req.body;
-                
-                try {
-                    if (type === 'new' && session.testCases.new && index < session.testCases.new.length) {
-                        session.testCases.new.splice(index, 1);
-                    } else if (type === 'modify' && session.testCases.modify && index < session.testCases.modify.length) {
-                        session.testCases.modify.splice(index, 1);
-                    } else {
-                        return res.status(400).json({ error: 'Invalid type or index' });
-                    }
-
-                    approvalSessions.set(sessionId, session);
-                    res.json({ status: 'deleted', message: 'Test case deleted successfully' });
-                } catch (error) {
-                    res.status(500).json({ error: 'Failed to delete test case' });
-                }
-            });
+      app.get("/", (_req, res) =>
+        res.sendFile(path.join(__dirname, 'review-ui', 'index.html'))
+      );
 
-            const server = app.listen(port, async () => {
-                // Remove console.log to prevent JSON parsing errors
-                try {
-                    const { default: open } = await import('open');
-                    await open(`http://localhost:${port}`);
-                } catch (openError) {
-                    // Silent fail for browser opening
-                }
-            });
+      app.get("/api/testcases", (_req, res) => {
+        const session = approvalSessions.get(sessionId);
+        if (!session) return res.status(404).json({ error: 'Session not found' });
+        res.json({ sessionId, testCases: session.testCases });
+      });
 
-            const session = approvalSessions.get(sessionId);
-            session.server = server;
-            approvalSessions.set(sessionId, session);
-
-            setTimeout(() => {
-                const session = approvalSessions.get(sessionId);
-                if (session && session.status === 'pending') {
-                    session.status = 'timeout';
-                    if (session.server) {
-                        session.server.close();
-                    }
-                    approvalSessions.set(sessionId, session);
-                }
-            }, 300000);
-
-            // Return clean JSON response
-            return JSON.stringify({
-                status: "review_started",
-                sessionId: sessionId,
-                message: "Test case review interface opened in browser. Use check_approval_status tool to poll for approval.",
-                testCasesCount: testCases.length,
-                browserUrl: `http://localhost:${port}`,
-                instructions: "Poll using check_approval_status tool continuously for  max 10 times"
-            });
+      app.post(`/delete/${sessionId}`, (req, res) => {
+        const session = approvalSessions.get(sessionId);
+        if (!session) return res.status(404).json({ error: 'Session not found' });
 
-        } catch (err) {
-            return JSON.stringify({
-                status: "error",
-                message: `Error setting up review interface: ${err.message}`
-            });
+        const { type, id } = req.body;
+        if (!['new', 'modify'].includes(type) || !id) {
+            return res.status(400).json({ error: 'Invalid delete request' });
         }
-    }
-);
-
-tool(
-    "check_approval_status",
-    "Check the approval status of test cases review session with 25 second wait",
-    {
-        sessionId: zod_1.z.string().describe("The session ID returned from review_testcases tool")
-    },
-    async ({ sessionId }) => {
-        await new Promise(resolve => setTimeout(resolve, 25000));
+        try {
+          session.testCases[type] = session.testCases[type].filter(tc => tc.id !== id);
+          approvalSessions.set(sessionId, session);
+          return res.json({ status: 'deleted', testCases: session.testCases });
+        } catch {
+          return res.status(500).json({ error: 'Failed to delete test case' });
+        }
+      });
 
+      app.post(`/approve/${sessionId}`, (req, res) => {
         const session = approvalSessions.get(sessionId);
-        if (!session) {
-            return `❌ Session not found. Invalid session ID: ${sessionId}`;
+        if (session) {
+          // overwrite authoritative copy with the submitted version
+          session.testCases = req.body;
+          session.finalTestCases = req.body;
+          session.status = 'approved';
+          approvalSessions.set(sessionId, session);
         }
+        res.json({ status: 'approved', message: 'Test cases approved successfully!' });
+      });
 
-        const currentTime = Date.now();
-        const elapsedTime = Math.floor((currentTime - session.startTime) / 1000);
+      app.post(`/cancel/${sessionId}`, (_req, res) => {
+        const session = approvalSessions.get(sessionId);
+        if (session) {
+          session.status = 'cancelled';
+          approvalSessions.set(sessionId, session);
+        }
+        res.json({ status: 'cancelled', message: 'Review cancelled' });
+      });
 
-        if (session.status === 'approved') {
-            const approvedTestCases = session.finalTestCases || session.testCases;
+      const serverInstance = app.listen(port, async () => {
+        try {
+          const { default: open } = await import('open');
+          await open(`http://localhost:${port}`);
+        } catch { /* silent */ }
+      });
 
-            if (session.server) {
-                session.server.close();
-            }
-            approvalSessions.delete(sessionId);
+      const stored = approvalSessions.get(sessionId);
+      stored.server = serverInstance;
+      approvalSessions.set(sessionId, stored);
+
+      // timeout safeguard
+      setTimeout(() => {
+        const s = approvalSessions.get(sessionId);
+        if (s && s.status === 'pending') {
+          s.status = 'timeout';
+          s.server?.close();
+          approvalSessions.set(sessionId, s);
+        }
+      }, 300000);
+
+      return {
+        status: "review_started",
+        sessionId,
+        message: "Test case review interface opened.",
+        testCasesCount: testCases.length,
+        browserUrl: `http://localhost:${port}`,
+        instructions: "Use check_approval_status tool to poll."
+      };
+    } catch (err) {
+      return { status: "error", message: `Error setting up review interface: ${err.message}` };
+    }
+  }
+);
 
-            return `✅ Test cases approved successfully! Elapsed time: ${elapsedTime}s\n\nApproved test cases:\n${JSON.stringify(approvedTestCases, null, 2)}`;
-        } else if (session.status === 'cancelled') {
-            if (session.server) {
-                session.server.close();
-            }
-            approvalSessions.delete(sessionId);
 
-            return `❌ Review was cancelled by the user. Elapsed time: ${elapsedTime}s`;
-        } else if (session.status === 'timeout' || elapsedTime > 300) {
-            if (session.server) {
-                session.server.close();
-            }
-            approvalSessions.delete(sessionId);
+tool(
+  "check_approval_status",
+  "Check the approval status of test cases review session (short-circuits if already approved)",
+  { sessionId: zod_1.z.string().describe("Session ID from review_testcases") },
+  async ({ sessionId }) => {
+    const session = approvalSessions.get(sessionId);
+    if (!session) return `❌ Session not found. Invalid session ID: ${sessionId}`;
+
+    const now = Date.now();
+    const elapsed = Math.floor((now - session.startTime) / 1000);
+
+    if (session.status === 'approved') {
+      const approvedTestCases = session.finalTestCases || session.testCases;
+      session.server?.close();
+      approvalSessions.delete(sessionId);
+      return `✅ Test cases approved. Elapsed: ${elapsed}s\n${JSON.stringify(approvedTestCases, null, 2)}`;
+    }
 
-            return `⏰ Review session timed out. Elapsed time: ${elapsedTime}s`;
-        } else {
-            const remainingTime = Math.max(0, 300 - elapsedTime);
-            return `⏳ Test cases are still pending approval. Elapsed: ${elapsedTime}s, Remaining: ${remainingTime}s`;
-        }
+    await new Promise(r => setTimeout(r, 5000));
+
+    const refreshed = approvalSessions.get(sessionId);
+    if (!refreshed) return `❌ Session expired`;
+
+    if (refreshed.status === 'approved') {
+      const approvedTestCases = refreshed.finalTestCases || refreshed.testCases;
+      refreshed.server?.close();
+      approvalSessions.delete(sessionId);
+      return `✅ Test cases approved. Elapsed: ${elapsed + 5}s\n${JSON.stringify(approvedTestCases, null, 2)}`;
+    } else if (refreshed.status === 'cancelled') {
+      refreshed.server?.close();
+      approvalSessions.delete(sessionId);
+      return `❌ Review cancelled. Elapsed: ${elapsed + 5}s`;
+    } else if (refreshed.status === 'timeout' || elapsed > 300) {
+      refreshed.server?.close();
+      approvalSessions.delete(sessionId);
+      return `⏰ Review session timed out. Elapsed: ${elapsed + 5}s`;
     }
+
+    return `⏳ Still pending. Elapsed: ${elapsed + 5}s Remaining: ${Math.max(0, 300 - (elapsed + 5))}s`;
+  }
 );
 
+
     return server;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nbakka/mcp-appium",
-  "version": "2.0.93",
+  "version": "2.0.95",
   "description": "Appium MCP",
   "engines": {
     "node": ">=18"