Merge pull request #24 from oslabs-beta/paython-mcp

lorencDedaj · web-flow · commit 110e4b3991d3 · 2025-11-13T10:50:49.000-05:00
diff --git a/Auto_Generated_Secure_CICD_Pipelines_with_AI_MCP_Demo.pptx b/Auto_Generated_Secure_CICD_Pipelines_with_AI_MCP_Demo.pptx
diff --git a/server/agent/wizardAgent.js b/server/agent/wizardAgent.js
@@ -6,13 +6,13 @@ dotenv.config();
 const client = new OpenAI({ apiKey: process.env.OPENAI_API_KEY });
 
 // Helper: call MCP routes dynamically, with error handling
-async function callMCPTool(tool, input) {
+async function callMCPTool(tool, input, cookie) {
   try {
     const response = await fetch(`http://localhost:3000/mcp/v1/${tool}`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        "Authorization": `Bearer ${process.env.MCP_SESSION_TOKEN}`,
+        "Cookie": cookie || (process.env.MCP_SESSION_TOKEN ? `mcp_session=${process.env.MCP_SESSION_TOKEN}` : ""),
       },
       body: JSON.stringify(input),
     });
@@ -25,6 +25,13 @@ async function callMCPTool(tool, input) {
 
 // Wizard Agent Core
 export async function runWizardAgent(userPrompt) {
+  // Normalize userPrompt into a consistent text form + extract cookie
+  const userPromptText =
+    typeof userPrompt === "string"
+      ? userPrompt
+      : userPrompt?.prompt || "";
+
+  const cookie = userPrompt?.cookie || "";
   const systemPrompt = `
   You are the MCP Wizard Agent.
   You have full access to the following connected tools and APIs:
@@ -43,55 +50,68 @@ export async function runWizardAgent(userPrompt) {
   - “Show recent commits for [username/repo]” → use \`github_adapter\` with \`{ action: "commits", repo: "[username/repo]" }\`
   - “List workflows for [username/repo]” → use \`github_adapter\` with \`{ action: "workflows", repo: "[username/repo]" }\`
   - “List repos”, “List repositories”, or “repositories” → use \`repo_reader\` with optional \`{ username: "...", user_id: "..." }\`
+  Valid CI/CD template types are ONLY:
+  - node_app
+  - python_app
+  - container_service
+
+  When selecting or generating a pipeline template, you MUST return one of these exact values.
+  Never invent new template names. If unsure, default to "node_app".
   `;
 
   const completion = await client.chat.completions.create({
     model: "gpt-4o-mini",
     messages: [
       { role: "system", content: systemPrompt },
-      { role: "user", content: userPrompt },
+      { role: "user", content: typeof userPrompt === "string" ? userPrompt : userPrompt.prompt },
     ],
   });
 
   const decision = completion.choices[0].message.content;
   console.log("\n🤖 Agent decided:", decision);
 
+  let agentMeta = {
+    agent_decision: decision,
+    tool_called: null,
+  };
+
   // Tool mapping using regex patterns
   const toolMap = {
     repo_reader: /\b(list repos|list repositories|repositories|repo_reader)\b/i,
     pipeline_generator: /\bpipeline\b/i,
+    pipeline_commit: /\b(yes commit|commit (the )?(pipeline|workflow|file)|apply (the )?(pipeline|workflow)|save (the )?(pipeline|workflow)|push (the )?(pipeline|workflow))\b/i,
     oidc_adapter: /\b(role|jenkins)\b/i,
     github_adapter: /\b(github|repo info|repository|[\w-]+\/[\w-]+)\b/i,
   };
 
   for (const [toolName, pattern] of Object.entries(toolMap)) {
-    if (pattern.test(decision)) {
+    if (pattern.test(decision) || pattern.test(userPromptText)) {
       console.log('🔧 Triggering MCP tool:', toolName);
 
       // --- Extract context dynamically from userPrompt or decision ---
       // Prefer explicit labels like: "repo owner/name", "template node_app", "provider aws"
-      const labeledRepo = userPrompt.match(/\brepo\s+([A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+)\b/i) 
+      const labeledRepo = userPromptText.match(/\brepo\s+([A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+)\b/i) 
                        || decision.match(/\brepo\s+([A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+)\b/i);
-      const genericRepo = (userPrompt + " " + decision).match(/\b(?!ci\/cd\b)([A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+)\b/);
+      const genericRepo = (userPromptText + " " + decision).match(/\b(?!ci\/cd\b)([A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+)\b/);
       const repo = (labeledRepo?.[1] || genericRepo?.[1] || null);
 
-      const labeledProvider = userPrompt.match(/\bprovider\s+(aws|jenkins|gcp|azure)\b/i) 
+      const labeledProvider = userPromptText.match(/\bprovider\s+(aws|jenkins|gcp|azure)\b/i) 
                            || decision.match(/\bprovider\s+(aws|jenkins|gcp|azure)\b/i);
-      const genericProvider = userPrompt.match(/\b(aws|jenkins|github actions|gcp|azure)\b/i) 
+      const genericProvider = userPromptText.match(/\b(aws|jenkins|github actions|gcp|azure)\b/i) 
                            || decision.match(/\b(aws|jenkins|github actions|gcp|azure)\b/i);
       const provider = (labeledProvider?.[1] || genericProvider?.[1] || null)?.toLowerCase().replace(/\s+/g, ' ');
 
-      const labeledTemplate = userPrompt.match(/\btemplate\s+([a-z_][a-z0-9_]+)\b/i) 
+      const labeledTemplate = userPromptText.match(/\btemplate\s+([a-z_][a-z0-9_]+)\b/i) 
                            || decision.match(/\btemplate\s+([a-z_][a-z0-9_]+)\b/i);
-      const genericTemplate = userPrompt.match(/\b(node_app|python_app|container_service|node|python|react|express|django|flask|java|go)\b/i) 
+      const genericTemplate = userPromptText.match(/\b(node_app|python_app|container_service|node|python|react|express|django|flask|java|go)\b/i) 
                            || decision.match(/\b(node_app|python_app|container_service|node|python|react|express|django|flask|java|go)\b/i);
       const template = (labeledTemplate?.[1] || genericTemplate?.[1] || null)?.toLowerCase();
 
       if (toolName === "repo_reader") {
         // Extract optional username, user_id, and repo info
-        const usernameMatch = userPrompt.match(/\busername[:=]?\s*([\w-]+)\b/i);
-        const userIdMatch = userPrompt.match(/\buser[_ ]?id[:=]?\s*([\w-]+)\b/i);
-        const repoMatch = userPrompt.match(/\b([\w-]+\/[\w-]+)\b/);
+        const usernameMatch = userPromptText.match(/\busername[:=]?\s*([\w-]+)\b/i);
+        const userIdMatch = userPromptText.match(/\buser[_ ]?id[:=]?\s*([\w-]+)\b/i);
+        const repoMatch = userPromptText.match(/\b([\w-]+\/[\w-]+)\b/);
 
         const payload = {};
         if (usernameMatch) payload.username = usernameMatch[1];
@@ -102,7 +122,14 @@ export async function runWizardAgent(userPrompt) {
           payload.repo = `${username}/${repo}`;
         }
 
-        return await callMCPTool("repo_reader", payload);
+        agentMeta.tool_called = "repo_reader";
+        const output = await callMCPTool("repo_reader", payload, cookie);
+        return {
+          success: true,
+          agent_decision: agentMeta.agent_decision,
+          tool_called: agentMeta.tool_called,
+          tool_output: output
+        };
       }
 
       if (toolName === "pipeline_generator") {
@@ -121,7 +148,7 @@ export async function runWizardAgent(userPrompt) {
         // Fetch GitHub repo details before pipeline generation
         let repoInfo = null;
         try {
-          const info = await callMCPTool("github_adapter", { action: "info", repo });
+          const info = await callMCPTool("github_adapter", { action: "info", repo }, cookie);
           if (info?.data?.success) {
             repoInfo = info.data;
             console.log(`📦 Retrieved repo info from GitHub:`, repoInfo);
@@ -151,6 +178,13 @@ export async function runWizardAgent(userPrompt) {
         if (payload.template === "python") payload.template = "python_app";
         if (payload.template === "container") payload.template = "container_service";
 
+        // --- Validate template against allowed values ---
+        const allowedTemplates = ["node_app", "python_app", "container_service"];
+        if (!allowedTemplates.includes(payload.template)) {
+          console.warn("⚠ Invalid template inferred:", payload.template, "— auto-correcting to node_app.");
+          payload.template = "node_app";
+        }
+
         // --- Preserve repo context globally ---
         if (!payload.repo && globalThis.LAST_REPO_USED) {
           payload.repo = globalThis.LAST_REPO_USED;
@@ -166,17 +200,126 @@ export async function runWizardAgent(userPrompt) {
         }
 
         console.log("🧩 Final payload to pipeline_generator:", payload);
-        return await callMCPTool("pipeline_generator", payload);
+        agentMeta.tool_called = "pipeline_generator";
+        const output = await callMCPTool("pipeline_generator", payload, cookie);
+
+        // Extract YAML for confirmation step
+        const generatedYaml =
+          output?.data?.data?.generated_yaml ||
+          output?.tool_output?.data?.generated_yaml ||
+          null;
+
+        // Store YAML globally for future commit step
+        globalThis.LAST_GENERATED_YAML = generatedYaml;
+
+        // Return confirmation-required structure
+        return {
+          success: true,
+          requires_confirmation: true,
+          message: "A pipeline has been generated. Would you like me to commit this workflow file to your repository?",
+          agent_decision: agentMeta.agent_decision,
+          tool_called: agentMeta.tool_called,
+          generated_yaml: generatedYaml,
+          pipeline_metadata: output
+        };
+      }
+
+      if (toolName === "pipeline_commit") {
+        console.log("📝 Commit intent detected.");
+
+        // ❗ Guard: Prevent confusing "repo commit history" with "pipeline commit"
+        if (/recent commits|commit history|see commits|show commits|view commits/i.test(decision + " " + userPromptText)) {
+          console.log("⚠ Not pipeline commit. Detected intention to view repo commit history.");
+          agentMeta.tool_called = "github_adapter";
+
+          const repoForCommits = repo || globalThis.LAST_REPO_USED;
+          if (!repoForCommits) {
+            return {
+              success: false,
+              error: "Please specify a repository, e.g. 'show commits for user/repo'."
+            };
+          }
+
+          const output = await callMCPTool("github_adapter", { action: "commits", repo: repoForCommits }, cookie);
+
+          return {
+            success: true,
+            agent_decision: agentMeta.agent_decision,
+            tool_called: agentMeta.tool_called,
+            tool_output: output
+          };
+        }
+
+        // Ensure we have a repo
+        const commitRepo = repo || globalThis.LAST_REPO_USED;
+        if (!commitRepo) {
+          return {
+            success: false,
+            error: "I don’t know which repository to commit to. Please specify the repo (e.g., 'commit to user/repo')."
+          };
+        }
+
+        // Extract YAML from userPrompt or fallback to last generated YAML
+        const yamlMatch = userPromptText.match(/```yaml([\s\S]*?)```/i);
+        const yamlFromPrompt = yamlMatch ? yamlMatch[1].trim() : null;
+
+        const yaml =
+          yamlFromPrompt ||
+          globalThis.LAST_GENERATED_YAML ||
+          null;
+
+        if (!yaml) {
+          return {
+            success: false,
+            error: "I don’t have a pipeline YAML to commit. Please generate one first."
+          };
+        }
+
+        // Save YAML globally for future edits
+        globalThis.LAST_GENERATED_YAML = yaml;
+
+        const commitPayload = {
+          repoFullName: commitRepo,
+          yaml,
+          branch: "main",
+          path: ".github/workflows/ci.yml"
+        };
+
+        agentMeta.tool_called = "pipeline_commit";
+        const output = await callMCPTool("pipeline_commit", commitPayload, cookie);
+
+        return {
+          success: true,
+          agent_decision: agentMeta.agent_decision,
+          tool_called: agentMeta.tool_called,
+          committed_repo: commitRepo,
+          committed_path: ".github/workflows/ci.yml",
+          tool_output: output
+        };
       }
 
       if (toolName === "oidc_adapter") {
         const payload = provider ? { provider } : {};
-        return await callMCPTool("oidc_adapter", payload);
+        agentMeta.tool_called = "oidc_adapter";
+        const output = await callMCPTool("oidc_adapter", payload, cookie);
+        return {
+          success: true,
+          agent_decision: agentMeta.agent_decision,
+          tool_called: agentMeta.tool_called,
+          tool_output: output
+        };
       }
 
       if (toolName === "github_adapter") {
         if (repo) {
-          return await callMCPTool("github/info", { repo });
+          agentMeta.tool_called = "github_adapter";
+          const output = await callMCPTool("github/info", { repo }, cookie);
+          return {
+            success: true,
+            agent_decision: agentMeta.agent_decision,
+            tool_called: agentMeta.tool_called,
+            tool_output: output
+          };
         } else {
           console.warn("⚠️ Missing repo for GitHub info retrieval.");
           return { 
@@ -188,7 +331,12 @@ export async function runWizardAgent(userPrompt) {
     }
   }
 
-  return { message: "No matching tool found. Try asking about a repo, pipeline, or AWS role." };
+  return {
+    success: false,
+    agent_decision: agentMeta.agent_decision,
+    tool_called: null,
+    message: "No matching tool found. Try asking about a repo, pipeline, or AWS role."
+  };
 }
 
 // Example local test (can comment out for production)
diff --git a/server/agent/wizardAgent_prompts.md b/server/agent/wizardAgent_prompts.md
@@ -27,7 +27,7 @@ node server/agent/wizardAgent.js "Show the languages used in PVeazie951/soloProj
 
 ---
 
-## 📂 Repo Contents / Files
+## TODO 📂 Repo Contents / Files
 
 These interact with the `list_root` and `contents` actions in the GitHub adapter.
 
@@ -49,7 +49,7 @@ These prompts trigger the pipeline generator logic and repo inference system.
 ```bash
 node server/agent/wizardAgent.js "Generate a pipeline for my Node app"
 node server/agent/wizardAgent.js "Generate a CI/CD pipeline for PVeazie951/soloProject"
-node server/agent/wizardAgent.js "What kind of pipeline should I use for PVeazie951/google-extention-ai-summarizer"
+node server/agent/wizardAgent.js "What kind of CICD pipeline should I use for PVeazie951/google-extention-ai-summarizer"
 node server/agent/wizardAgent.js "Create a GitHub Actions pipeline for my soloProject repo"
 node server/agent/wizardAgent.js "What kind of deployment pipeline fits this repo"
 node server/agent/wizardAgent.js "Use Jenkins instead of GitHub Actions for deployment"
diff --git a/server/routes/agent.js b/server/routes/agent.js
@@ -7,11 +7,12 @@ import { runWizardAgent } from '../agent/wizardAgent.js';
 import { pipeline_generator } from '../tools/pipeline_generator.js';
 import { repo_reader } from '../tools/repo_reader.js';
 import { oidc_adapter } from '../tools/oidc_adapter.js';
+import { requireSession } from '../lib/requireSession.js';
 
 const router = express.Router();
 
 // Trigger full pipeline wizard (MVP agent)
-router.post('/wizard', async (req, res) => {
+router.post('/wizard', requireSession, async (req, res) => {
   try {
     const { repoUrl, provider, branch } = req.body;
     if (!repoUrl || !provider || !branch) {
@@ -22,16 +23,39 @@ router.post('/wizard', async (req, res) => {
           error: 'Missing required fields: repoUrl, provider, branch',
         });
     }
-    const result = await runWizardAgent({ repoUrl, provider, branch });
+    const result = await runWizardAgent({
+      repoUrl,
+      provider,
+      branch,
+      cookie: req.headers.cookie
+    });
     res.json({ success: true, data: result });
   } catch (err) {
     console.error('Wizard Error:', err);
     res.status(500).json({ success: false, error: err.message });
   }
 });
 
+// Trigger wizard agent with AI prompt
+router.post('/wizard/ai', requireSession, async (req, res) => {
+  try {
+    const { prompt } = req.body;
+    if (!prompt) {
+      return res.status(400).json({ success: false, error: 'Missing required field: prompt' });
+    }
+    const result = await runWizardAgent({
+      prompt,
+      cookie: req.headers.cookie
+    });
+    res.json({ success: true, data: result });
+  } catch (err) {
+    console.error('Wizard AI Error:', err);
+    res.status(500).json({ success: false, error: err.message });
+  }
+});
+
 // Generate pipeline only
-router.post('/pipeline', async (req, res) => {
+router.post('/pipeline', requireSession, async (req, res) => {
   try {
     const { repoUrl } = req.body;
     if (!repoUrl) {
@@ -51,7 +75,7 @@ router.post('/pipeline', async (req, res) => {
 });
 
 // Read repository metadata
-router.post('/analyze', async (req, res) => {
+router.post('/analyze', requireSession, async (req, res) => {
   try {
     const { repoUrl } = req.body;
     if (!repoUrl) {
@@ -67,7 +91,7 @@ router.post('/analyze', async (req, res) => {
 });
 
 // Deploy to AWS (via OIDC)
-router.post('/deploy', async (req, res) => {
+router.post('/deploy', requireSession, async (req, res) => {
   try {
     const { provider } = req.body;
     if (!provider) {
