diff --git a/client/src/pages/ConfigurePage.tsx b/client/src/pages/ConfigurePage.tsx
index 9578b2e..a5c7a98 100644
--- a/client/src/pages/ConfigurePage.tsx
+++ b/client/src/pages/ConfigurePage.tsx
@@ -226,7 +226,7 @@ export default function ConfigurePage() {
           <section className="space-y-6 rounded-2xl border border-white/20 bg-white/10 backdrop-blur-md shadow-glass p-6 text-white">
             {/* Template */}
             <label className="grid gap-1">
-              <span className="text-sm font-medium">Template</span>
+              <span className="text-sm font-medium text-slate-800">Template</span>
               <select
                 disabled={busy}
                 value={template}
@@ -261,7 +261,7 @@ export default function ConfigurePage() {
 
             {/* Stages */}
             <fieldset className="space-y-2">
-              <legend className="text-sm font-medium">Enabled stages</legend>
+              <legend className="text-sm font-medium text-slate-800">Enabled stages</legend>
               <div className="flex flex-wrap gap-3">
                 {(["build", "test", "deploy"] as const).map((stage) => (
                   <label
@@ -284,7 +284,7 @@ export default function ConfigurePage() {
             {/* Node version + commands */}
             <div className="grid gap-4">
               <label className="grid gap-1">
-                <span className="text-sm font-medium">Node version</span>
+                <span className="text-sm font-medium text-slate-800">Node version</span>
                 <input
                   disabled={busy}
                   value={options.nodeVersion}
@@ -295,7 +295,7 @@ export default function ConfigurePage() {
               </label>
 
               <label className="grid gap-1">
-                <span className="text-sm font-medium">Install command</span>
+                <span className="text-sm font-medium text-slate-800">Install command</span>
                 <input
                   disabled={busy}
                   value={options.installCmd}
@@ -306,7 +306,7 @@ export default function ConfigurePage() {
               </label>
 
               <label className="grid gap-1">
-                <span className="text-sm font-medium">Test command</span>
+                <span className="text-sm font-medium text-slate-800">Test command</span>
                 <input
                   disabled={busy}
                   value={options.testCmd}
@@ -317,7 +317,7 @@ export default function ConfigurePage() {
               </label>
 
               <label className="grid gap-1">
-                <span className="text-sm font-medium">Build command</span>
+                <span className="text-sm font-medium text-slate-800">Build command</span>
                 <input
                   disabled={busy}
                   value={options.buildCmd}
diff --git a/client/vite.config.ts b/client/vite.config.ts
index 55d0c8f..2c25316 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -20,11 +20,15 @@ export default defineConfig({
         target: "http://localhost:3000",
         changeOrigin: true,
       },
-      // // optional, if you have other endpoints like /api
-      // "/api": {
-      //   target: "http://localhost:3000",
-      //   changeOrigin: true,
-      // },
+      // optional, if you have other endpoints like /api
+      "/api": {
+        target: "http://localhost:3000",
+        changeOrigin: true,
+      },
+      "/agent": {
+        target: "http://localhost:3000",
+        changeOrigin: true,
+      },
     },
   },
 });
diff --git a/server/agent/wizardAgent copy.js b/server/agent/wizardAgent copy.js
new file mode 100644
index 0000000..26989cd
--- /dev/null
+++ b/server/agent/wizardAgent copy.js	
@@ -0,0 +1,494 @@
+import OpenAI from "openai";
+import dotenv from "dotenv";
+import fetch from "node-fetch";
+
+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, cookie) {
+  try {
+    const response = await fetch(`http://localhost:3000/mcp/v1/${tool}`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "Cookie": cookie || (process.env.MCP_SESSION_TOKEN ? `mcp_session=${process.env.MCP_SESSION_TOKEN}` : ""),
+      },
+      body: JSON.stringify(input),
+    });
+    return await response.json();
+  } catch (err) {
+    console.warn("⚠️ MCP call failed:", err.message || err);
+    return { error: "MCP server unreachable" };
+  }
+}
+
+// Wizard Agent Core
+export async function runWizardAgent(userPrompt) {
+  // Normalize userPrompt into a consistent text form + extract cookie
+  const userPromptText =
+    typeof userPrompt === "string"
+      ? userPrompt
+      : userPrompt?.content ||
+        userPrompt?.message ||
+        userPrompt?.prompt ||
+        userPrompt?.body?.content ||
+        userPrompt?.body?.message ||
+        userPrompt?.body?.prompt ||
+        "";
+
+  // 🛑 Intent guard: handle meta / capability questions WITHOUT tools
+  if (/what can you do|what do you do|help|capabilities|how does this work/i.test(userPromptText)) {
+    return {
+      success: true,
+      agent_decision: "capabilities",
+      tool_called: null,
+      message: `
+I’m your CI/CD wizard. Here’s what I can help you with:
+
+• Analyze your GitHub repositories
+• Generate GitHub Actions CI/CD pipelines
+• Suggest best practices (branches, caching, matrix builds)
+• Configure Node, Python, or container-based workflows
+• Help commit workflows and open pull requests
+• Explain CI/CD concepts step by step
+
+Tell me what you’d like to do next.
+`
+    };
+  }
+
+  // Guard: prevent empty or meaningless prompts from reaching the LLM
+  if (!userPromptText || userPromptText.trim().length < 3) {
+    return {
+      success: false,
+      agent_decision: "Your message was too short or empty. Please provide more detail, such as 'list my repos' or 'tell me about user/repo'.",
+      tool_called: null,
+      message: "Please provide a more descriptive request."
+    };
+  }
+
+  const cookie = userPrompt?.cookie || "";
+  const systemPrompt = `
+  You are the MCP Wizard Agent.
+  You have full access to the following connected tools and APIs:
+  - repo_reader: reads local and remote repositories, useful for listing or describing repositories
+  - pipeline_generator: generates CI/CD YAMLs
+  - oidc_adapter: lists AWS roles or Jenkins jobs
+  - github_adapter: fetches real-time GitHub repository data through an authenticated API connection
+  Do not say that you lack access to GitHub or external data — you can retrieve this information directly through the available tools.
+  Only call tools when the user explicitly asks for data retrieval or actions. Do NOT call tools for explanations, help, or capability questions.
+
+  If the user asks:
+  - “What repositories do I have on GitHub?” → use \`github_adapter\` with \`{ action: "repos" }\`
+  - “Tell me about [username/repo]” → use \`github_adapter\` with \`{ action: "info", repo: "[username/repo]" }\`
+  - “Tell me about [username/repo] using repo_reader” → use \`repo_reader\` with \`{ username: "...", repo: "[username/repo]" }\`
+  - “List branches for [username/repo]” → use \`github_adapter\` with \`{ action: "branches", repo: "[username/repo]" }\`
+  - “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:
+    typeof userPrompt === "string"
+      ? userPrompt
+      : userPrompt?.content || userPrompt?.message ||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|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,
+  };
+
+  // Short-circuit if agent_decision is "capabilities"
+  if (agentMeta.agent_decision === "capabilities") {
+    return {
+      success: true,
+      agent_decision: agentMeta.agent_decision,
+      tool_called: null
+    };
+  }
+
+  for (const [toolName, pattern] of Object.entries(toolMap)) {
+    if (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 = 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 = (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 = userPromptText.match(/\bprovider\s+(aws|jenkins|gcp|azure)\b/i) 
+                           || decision.match(/\bprovider\s+(aws|jenkins|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 = userPromptText.match(/\btemplate\s+([a-z_][a-z0-9_]+)\b/i) 
+                           || decision.match(/\btemplate\s+([a-z_][a-z0-9_]+)\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") {
+        // Prevent accidental file reads with repo_reader
+        if (/\b(read|get|open)\b.*\b(file|contents)\b/i.test(userPromptText)) {
+          return {
+            success: false,
+            error: "File reading is handled by the GitHub adapter. Please specify a GitHub repository and file path."
+          };
+        }
+        // Extract optional username, user_id, and repo info
+        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];
+        if (userIdMatch) payload.user_id = userIdMatch[1];
+        if (repoMatch) {
+          const [username, repo] = repoMatch[1].split("/");
+          payload.username = username;
+          payload.repo = `${username}/${repo}`;
+        }
+
+        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") {
+        if (!repo) {
+          console.warn("⚠️ Missing repo context for pipeline generation.");
+          return { 
+            success: false, 
+            error: "I couldn’t determine which repository you meant. Please specify it, e.g., 'generate pipeline for user/repo'." 
+          };
+        }
+
+        const payload = { repo };
+        if (provider) payload.provider = provider;
+        if (template) payload.template = template;
+
+        // Fetch GitHub repo details before pipeline generation
+        let repoInfo = null;
+        try {
+          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);
+          }
+        } catch (err) {
+          console.warn("⚠️ Failed to fetch GitHub info before pipeline generation:", err.message);
+        }
+
+        // Merge language or visibility into payload if available
+        if (repoInfo?.language && !payload.language) payload.language = repoInfo.language.toLowerCase();
+        if (repoInfo?.visibility && !payload.visibility) payload.visibility = repoInfo.visibility;
+
+        // Infer template if still missing
+        if (!payload.template) {
+          if (repoInfo?.language?.toLowerCase().includes("javascript") || repoInfo?.language?.toLowerCase().includes("typescript") || /js|ts|node|javascript/i.test(repo)) {
+            payload.template = "node_app";
+          } else if (repoInfo?.language?.toLowerCase().includes("python") || /py|flask|django/i.test(repo)) {
+            payload.template = "python_app";
+          } else {
+            payload.template = "container_service";
+          }
+          console.log(`🪄 Inferred template: ${payload.template}`);
+        }
+
+        // --- Auto-correct short template names ---
+        if (payload.template === "node") payload.template = "node_app";
+        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;
+        } else if (payload.repo) {
+          globalThis.LAST_REPO_USED = payload.repo;
+        }
+
+        // ✅ Ensure provider is valid before sending payload
+        if (!payload.provider || !["aws", "jenkins"].includes(payload.provider)) {
+          // Infer from repo visibility or fallback to AWS
+          payload.provider = repoInfo?.visibility === "private" ? "jenkins" : "aws";
+          console.log(`🧭 Inferred provider: ${payload.provider}`);
+        }
+
+        console.log("🧩 Final payload to 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 } : {};
+        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") {
+        agentMeta.tool_called = "github_adapter";
+
+        // 🔎 Resolve github action explicitly (Option A)
+        let action = "info";
+        let path;
+
+        // --- Repo listing ---
+        if (/\b(repos|repositories)\b.*\b(available|list|show|have|exist)\b|\b(list|show|what|which)\b.*\b(repos|repositories)\b/i.test(userPromptText)) {
+          action = "repos";
+        }
+        // --- Repo contents (directories / existence checks) ---
+        else if (
+          /\b(contents|files|structure|directory|folder|root)\b/i.test(userPromptText) ||
+          /\b(list|show|view|browse|check)\b.*\b(root|files)\b/i.test(userPromptText)
+        ) {
+          action = "contents";
+
+          // Extract optional path (e.g. "at server/", "in src/")
+          const pathMatch =
+            userPromptText.match(/\b(?:in|at)\s+([A-Za-z0-9_.\-\/]+)\b/i);
+
+          path = pathMatch?.[1];
+        }
+        // --- Directory existence check ---
+        else if (/\b(is there|does .* have|check for|verify)\b.*\b([A-Za-z0-9_.\-\/]+\/[A-Za-z0-9_.\-\/]+)\b/i.test(userPromptText)) {
+          action = "contents";
+
+          const dirMatch =
+            userPromptText.match(/\b([A-Za-z0-9_.\-\/]+\/[A-Za-z0-9_.\-\/]+)\b/i);
+
+          path = dirMatch?.[1];
+        }
+        // --- Generic file existence check (supports extensionless files) ---
+        else if (/\b(is there|does .* have|check for|verify)\b/i.test(userPromptText)) {
+          const fileMatch =
+            userPromptText.match(/\b(Dockerfile|Makefile|\.env|\.gitignore)\b/i) ||
+            userPromptText.match(/\b([A-Za-z0-9_.\-\/]+\.[A-Za-z0-9]+)\b/i);
+
+          if (fileMatch) {
+            action = "file";
+            path = fileMatch[1];
+          }
+        }
+        // --- File read ---
+        else if (/\b(read|get|open|show)\b.*\b(file|contents)\b/i.test(userPromptText)) {
+          action = "file";
+
+          const fileMatch =
+            userPromptText.match(/\b(?:file\s+)?([A-Za-z0-9_.\-\/]+\.[A-Za-z0-9]+)\b/i);
+
+          path = fileMatch?.[1];
+        }
+        // --- Repo metadata ---
+        else if (/branches/i.test(userPromptText)) {
+          action = "branches";
+        } else if (/commits/i.test(userPromptText)) {
+          action = "commits";
+        } else if (/workflows/i.test(userPromptText)) {
+          action = "workflows";
+        }
+
+        // 🔹 List repos does NOT require a repo
+        if (action === "repos") {
+          const output = await callMCPTool(
+            "github_adapter",
+            { action },
+            cookie
+          );
+
+          return {
+            success: true,
+            agent_decision: agentMeta.agent_decision,
+            tool_called: agentMeta.tool_called,
+            tool_output: output
+          };
+        }
+
+        // 🔹 All other github actions REQUIRE a repo
+        if (!repo) {
+          return {
+            success: false,
+            error: "Please specify a repository (e.g. 'tell me about user/repo')."
+          };
+        }
+
+        // Only include path if it exists
+        const payload = { action, repo };
+        if (path) payload.path = path;
+
+        const output = await callMCPTool(
+          "github_adapter",
+          payload,
+          cookie
+        );
+
+        return {
+          success: true,
+          agent_decision: agentMeta.agent_decision,
+          tool_called: agentMeta.tool_called,
+          tool_output: output
+        };
+      }
+    }
+  }
+
+  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)
+if (process.argv[2]) {
+  const input = process.argv.slice(2).join(" ");
+  runWizardAgent(input)
+    .then((res) => {
+      console.log("\n📦 Tool Output:\n", JSON.stringify(res, null, 2));
+    })
+    .catch(console.error);
+}
\ No newline at end of file
diff --git a/server/agent/wizardAgent.js b/server/agent/wizardAgent.js
index d5377e9..fb30eac 100644
--- a/server/agent/wizardAgent.js
+++ b/server/agent/wizardAgent.js
@@ -23,6 +23,49 @@ function getOpenAIClient() {
 }
 // -----------------------
 
+// --- Intent extraction using LLM (structured, no regex routing) ---
+async function extractGitHubIntent(llmClient, userText) {
+  const intentPrompt = `
+You are an intent classifier for a GitHub automation agent.
+
+Return ONLY valid JSON. Do not explain anything.
+
+Valid intents:
+- list_repos
+- repo_info
+- list_root
+- list_path
+- check_file
+- check_dir
+- read_file
+- list_workflows
+- list_branches
+- list_commits
+
+Return JSON with exactly these fields:
+{
+  "intent": string,
+  "repo": string | null,
+  "path": string | null
+}
+
+User request:
+"${userText}"
+`;
+
+  const res = await llmClient.chat.completions.create({
+    model: "gpt-4o-mini",
+    messages: [{ role: "system", content: intentPrompt }],
+  });
+
+  try {
+    return JSON.parse(res.choices[0].message.content);
+  } catch (e) {
+    console.warn("⚠️ Failed to parse intent JSON, falling back to repo_info");
+    return { intent: "repo_info", repo: null, path: null };
+  }
+}
+
 // Helper: call MCP routes dynamically, with error handling
 async function callMCPTool(tool, input, cookie) {
   try {
@@ -59,6 +102,27 @@ export async function runWizardAgent(userPrompt) {
         userPrompt?.body?.prompt ||
         '';
 
+  // 🛑 Intent guard: handle meta / capability questions WITHOUT tools
+  if (/what can you do|what do you do|help|capabilities|how does this work/i.test(userPromptText)) {
+    return {
+      success: true,
+      agent_decision: "capabilities",
+      tool_called: null,
+      message: `
+I’m your CI/CD wizard. Here’s what I can help you with:
+
+• Analyze your GitHub repositories
+• Generate GitHub Actions CI/CD pipelines
+• Suggest best practices (branches, caching, matrix builds)
+• Configure Node, Python, or container-based workflows
+• Help commit workflows and open pull requests
+• Explain CI/CD concepts step by step
+
+Tell me what you’d like to do next.
+`
+    };
+  }
+
   // Guard: prevent empty or meaningless prompts from reaching the LLM
   if (!userPromptText || userPromptText.trim().length < 3) {
     return {
@@ -79,7 +143,7 @@ export async function runWizardAgent(userPrompt) {
   - oidc_adapter: lists AWS roles or Jenkins jobs
   - github_adapter: fetches real-time GitHub repository data through an authenticated API connection
   Do not say that you lack access to GitHub or external data — you can retrieve this information directly through the available tools.
-  Always respond with factual data from the tool response only.
+  Only call tools when the user explicitly asks for data retrieval or actions. Do NOT call tools for explanations, help, or capability questions.
 
   If the user asks:
   - “What repositories do I have on GitHub?” → use \`github_adapter\` with \`{ action: "repos" }\`
@@ -139,7 +203,7 @@ export async function runWizardAgent(userPrompt) {
 
   // Tool mapping using regex patterns
   const toolMap = {
-    repo_reader: /\b(list repos|list repositories|repositories|repo_reader)\b/i,
+    repo_reader: /\b(list repos|list 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,
@@ -147,8 +211,17 @@ export async function runWizardAgent(userPrompt) {
     github_adapter: /\b(github|repo info|repository|[\w-]+\/[\w-]+)\b/i,
   };
 
+  // Short-circuit if agent_decision is "capabilities"
+  if (agentMeta.agent_decision === "capabilities") {
+    return {
+      success: true,
+      agent_decision: agentMeta.agent_decision,
+      tool_called: null
+    };
+  }
+
   for (const [toolName, pattern] of Object.entries(toolMap)) {
-    if (pattern.test(decision) || pattern.test(userPromptText)) {
+    if (pattern.test(userPromptText)) {
       console.log('🔧 Triggering MCP tool:', toolName);
 
       // --- Extract context dynamically from userPrompt or decision ---
@@ -188,7 +261,14 @@ export async function runWizardAgent(userPrompt) {
         null
       )?.toLowerCase();
 
-      if (toolName === 'repo_reader') {
+      if (toolName === "repo_reader") {
+        // Prevent accidental file reads with repo_reader
+        if (/\b(read|get|open)\b.*\b(file|contents)\b/i.test(userPromptText)) {
+          return {
+            success: false,
+            error: "File reading is handled by the GitHub adapter. Please specify a GitHub repository and file path."
+          };
+        }
         // Extract optional username, user_id, and repo info
         const usernameMatch = userPromptText.match(
           /\busername[:=]?\s*([\w-]+)\b/i
@@ -440,24 +520,102 @@ export async function runWizardAgent(userPrompt) {
         };
       }
 
-      if (toolName === 'github_adapter') {
-        if (repo) {
-          agentMeta.tool_called = 'github_adapter';
-          const output = await callMCPTool('github/info', { repo }, cookie);
+      if (toolName === "github_adapter") {
+        agentMeta.tool_called = "github_adapter";
+
+        // --- Structured intent extraction ---
+        const intentData = await extractGitHubIntent(client, userPromptText);
+        const { intent, repo: intentRepo, path: intentPath } = intentData;
+
+        const resolvedRepo = repo || intentRepo;
+
+        // 🔒 Path always implies filesystem, never GitHub Actions metadata
+        let normalizedIntent = intent;
+        if (intentPath && intent === "list_workflows") {
+          normalizedIntent = "list_path";
+        }
+
+        // Map intent → github_adapter action
+        let action;
+        let path;
+
+        switch (normalizedIntent) {
+          case "list_repos":
+            action = "repos";
+            break;
+
+          case "list_root":
+            action = "contents";
+            break;
+
+          case "list_path":
+            action = "contents";
+            path = intentPath;
+            break;
+
+          case "check_dir":
+            action = "contents";
+            path = intentPath;
+            break;
+
+          case "check_file":
+            action = "file";
+            path = intentPath;
+            break;
+
+          case "read_file":
+            action = "file";
+            path = intentPath;
+            break;
+
+          case "list_workflows":
+            action = "workflows";
+            break;
+
+          case "list_branches":
+            action = "branches";
+            break;
+
+          case "list_commits":
+            action = "commits";
+            break;
+
+          case "repo_info":
+          default:
+            action = "info";
+            break;
+        }
+
+        // Repos listing does not require repo
+        if (action === "repos") {
+          const output = await callMCPTool("github_adapter", { action }, 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.');
+        }
+
+        // All other actions require a repo
+        if (!resolvedRepo) {
           return {
             success: false,
-            error:
-              "Couldn’t determine which repository to fetch. Please include it in your request (e.g., 'tell me about user/repo').",
+            error: "Please specify a repository (e.g. 'user/repo')."
           };
         }
+
+        const payload = { action, repo: resolvedRepo };
+        if (path) payload.path = path;
+
+        const output = await callMCPTool("github_adapter", payload, cookie);
+
+        return {
+          success: true,
+          agent_decision: agentMeta.agent_decision,
+          tool_called: agentMeta.tool_called,
+          tool_output: output
+        };
       }
     }
   }
diff --git a/server/tools/github_adapter.js b/server/tools/github_adapter.js
index 2907020..8cf74e8 100644
--- a/server/tools/github_adapter.js
+++ b/server/tools/github_adapter.js
@@ -13,13 +13,16 @@ export const github_adapter = {
       'commits',
       'workflows',
       'get_repo',
+      'contents',
+      'file',
     ]),
     repo: z.string().optional(),
     user_id: z.string(),
+    path: z.string().optional(),
     page: z.number().optional(),
     per_page: z.number().optional(),
   }),
-  handler: async ({ action, repo, user_id, page = 1, per_page = 50 }) => {
+  handler: async ({ action, repo, user_id, path, page = 1, per_page = 50 }) => {
     if (!user_id) {
       throw new Error('Missing user_id in adapter call');
     }
@@ -49,6 +52,22 @@ export const github_adapter = {
     }
 
     const accessToken = res.rows[0].access_token;
+
+    async function getDefaultBranch(repo) {
+      const res = await fetch(`https://api.github.com/repos/${repo}`, {
+        headers: {
+          Authorization: `token ${accessToken}`,
+          Accept: 'application/vnd.github.v3+json',
+          'User-Agent': 'AutoDeploy-App',
+        },
+      });
+
+      if (!res.ok) return 'main';
+
+      const data = await res.json();
+      return data.default_branch || 'main';
+    }
+
     let apiUrl;
 
     switch (action) {
@@ -79,6 +98,25 @@ export const github_adapter = {
           throw new Error("Missing 'repo' parameter for workflows action");
         apiUrl = `https://api.github.com/repos/${repo}/actions/workflows`;
         break;
+      case 'contents':
+      case 'file': {
+        if (!repo)
+          throw new Error("Missing 'repo' parameter for contents/file action");
+
+        const safePath = path ? `/${encodeURIComponent(path)}` : '';
+
+        // Always include ref when path is provided (GitHub API quirk for dot-directories)
+        if (path) {
+          const defaultBranch = await getDefaultBranch(repo);
+          apiUrl = `https://api.github.com/repos/${repo}/contents${safePath}?ref=${encodeURIComponent(
+            defaultBranch
+          )}`;
+        } else {
+          apiUrl = `https://api.github.com/repos/${repo}/contents`;
+        }
+
+        break;
+      }
       default:
         throw new Error(`Unsupported action: ${action}`);
     }
@@ -161,6 +199,39 @@ export const github_adapter = {
           })),
         };
 
+      case 'contents':
+        return {
+          success: true,
+          contents: Array.isArray(data)
+            ? data.map((item) => ({
+                name: item.name,
+                path: item.path,
+                type: item.type,
+                size: item.size ?? null,
+              }))
+            : [],
+        };
+
+      case 'file':
+        if (data.type !== 'file') {
+          return {
+            success: false,
+            error: 'Requested path is not a file',
+          };
+        }
+
+        return {
+          success: true,
+          file: {
+            name: data.name,
+            path: data.path,
+            encoding: data.encoding,
+            content: data.content
+              ? Buffer.from(data.content, 'base64').toString('utf-8')
+              : null,
+          },
+        };
+
       case 'info':
       case 'get_repo':
       default:
diff --git a/server/tools/pipeline_generator.js b/server/tools/pipeline_generator.js
index 9b8e749..ab7a923 100644
--- a/server/tools/pipeline_generator.js
+++ b/server/tools/pipeline_generator.js
@@ -25,7 +25,77 @@ export const pipeline_generator = {
       .optional(),
   }),
 
-  handler: async ({ repo, branch = "main", provider = "aws", template, options }) => {
+  // Real handler (queries github_adapter for repo info and generates pipeline config)
+  handler: async ({ repo, branch = 'main', provider = 'aws', template, options }) => {
+    const normalized = {
+      nodeVersion: options?.nodeVersion,
+      installCmd: options?.installCmd,
+      testCmd: options?.testCmd,
+      buildCmd: options?.buildCmd,
+      awsRoleArn: options?.awsRoleArn,
+      stages: options?.stages,
+    };
+
+    const sessionToken = process.env.MCP_SESSION_TOKEN;
+    let decoded = {};
+    let userId = null;
+
+    // No req.cookies available in MCP tool mode — skip direct session lookups.
+    console.warn(
+      '⚠️ Skipping requireSession — tool is running without HTTP request context.'
+    );
+
+    // Fallback: decode MCP_SESSION_TOKEN if no user found
+    if (!userId && sessionToken) {
+      try {
+        decoded = jwt.decode(sessionToken);
+        userId = decoded?.user?.id || decoded?.sub || null;
+        if (userId)
+          console.log('🧠 Resolved user_id from decoded token:', userId);
+      } catch (err) {
+        console.warn('⚠️ Could not decode MCP_SESSION_TOKEN:', err.message);
+      }
+    }
+
+    if (!userId) {
+      console.warn('⚠️ Could not resolve user_id — defaulting to anonymous.');
+      userId = '00000000-0000-0000-0000-000000000000';
+    }
+
+    // 🧠 Try to resolve user_id from GitHub username if still anonymous
+    if (userId === '00000000-0000-0000-0000-000000000000') {
+      let githubUsername =
+        decoded?.github_username || process.env.GITHUB_USERNAME || null;
+
+      if (githubUsername) {
+        try {
+          const { rows: userRows } = await pool.query(
+            `SELECT id FROM users WHERE github_username = $1 LIMIT 1`,
+            [githubUsername]
+          );
+
+          if (userRows.length > 0) {
+            userId = userRows[0].id;
+            console.log('🔄 Resolved user_id from github_username:', userId);
+          } else {
+            console.warn(
+              '⚠️ No user found in DB matching github_username:',
+              githubUsername
+            );
+          }
+        } catch (err) {
+          console.warn(
+            '⚠️ Failed to resolve user_id from github_username:',
+            err.message
+          );
+        }
+      } else {
+        console.warn('⚠️ No GitHub username available to resolve user_id.');
+      }
+    }
+
+    // Try DB lookup for GitHub token first
+    let githubToken = null;
     try {
       const normalized = {
         nodeVersion: options?.nodeVersion,