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

williams21v · web-flow · commit a93cd3b23969 · 2025-12-15T20:26:42.000-05:00
feat: wire AI-generated pipelines into YAML preview and wizard context
diff --git a/client/src/pages/ConfigurePage.tsx b/client/src/pages/ConfigurePage.tsx
@@ -1,6 +1,7 @@
 import { useEffect, useState } from "react";
 import { useRepoStore } from "../store/useRepoStore";
 import { usePipelineStore } from "../store/usePipelineStore";
+import { useWizardStore } from "../store/useWizardStore";
 import { api } from "../lib/api";
 
 type ChatMessage = {
@@ -30,8 +31,17 @@ export default function ConfigurePage() {
     editedYaml,
     setEditedYaml,
     getEffectiveYaml,
+    hydrateFromWizard,
   } = usePipelineStore();
 
+  const {
+    repoInfo,
+    pipelineInfo,
+    setRepoInfo,
+    setPipelineInfo,
+    setLastToolCalled,
+  } = useWizardStore();
+
   const yaml = getEffectiveYaml();
   const busy = status === "loading";
 
@@ -57,6 +67,13 @@ export default function ConfigurePage() {
       alert("Pick a repo + branch on the Connect page first.");
       return;
     }
+    console.log("[ConfigurePage] Generate clicked with inputs:", {
+      repo,
+      branch,
+      template,
+      stages,
+      options,
+    });
     await regenerate({ repo, branch });
   };
 
@@ -92,40 +109,92 @@ export default function ConfigurePage() {
     setChatInput("");
     setChatLoading(true);
 
-      try {
-    const res = await api.askYamlWizard({
-      repoUrl: repo,       // backend expects "repoUrl"
-      provider: "aws",     // or whatever provider you use
-      branch: branch,      // backend expects "branch"
-      message: trimmed,    // optional, for your agent logic
-      yaml,                // optional, current YAML for context
-    });
-
-         const text =
-      (res as any)?.reply ??
-      (res as any)?.message ??
-      (res as any)?.content ??
-      JSON.stringify(res, null, 2);
-
-    const assistantMessage: ChatMessage = {
-      role: "assistant",
-      content: text,
-    };
-
-    setChatMessages((prev) => [...prev, assistantMessage]);
-  } catch (e: any) {
-    console.error("[ConfigurePage] AI wizard error:", e);
-    const assistantMessage: ChatMessage = {
-      role: "assistant",
-      content:
-        "Sorry, I ran into an issue talking to the AI backend.\n\n" +
-        `Error: ${e?.message ?? "Unknown error"}`,
-    };
-    setChatMessages((prev) => [...prev, assistantMessage]);
-  } finally {
-    setChatLoading(false);
-  }
-};
+    try {
+      const res = await api.askYamlWizard({
+        repoUrl: repo,       // backend expects "repoUrl"
+        provider: "aws",     // or whatever provider you use
+        branch: branch,      // backend expects "branch"
+        message: trimmed,    // optional, for your agent logic
+        yaml,                // optional, current YAML for context
+      });
+
+      // ---- Update wizard context memory ----
+      if ((res as any)?.tool_called) {
+        setLastToolCalled((res as any).tool_called);
+      }
+
+      // If repo info is available from selection or tool output, store it
+      if (repo) {
+        setRepoInfo({
+          fullName: repo,
+        });
+      }
+
+      // If a pipeline was generated, hydrate pipeline store + wizard context
+      if ((res as any)?.tool_called === "pipeline_generator") {
+        const generatedYaml =
+          (res as any)?.generated_yaml ??
+          (res as any)?.tool_output?.data?.generated_yaml;
+
+        const pipelineName =
+          (res as any)?.pipeline_metadata?.data?.pipeline_name ??
+          (res as any)?.pipeline_metadata?.pipeline_name;
+
+        if (generatedYaml) {
+          hydrateFromWizard({
+            repo,
+            generatedYaml,
+            pipelineName,
+          });
+        }
+
+        setPipelineInfo({
+          pipelineName,
+          branch,
+          provider: "aws",
+          stages,
+        });
+      }
+
+      let text: string;
+
+      if ((res as any)?.reply) {
+        text = (res as any).reply;
+      } else if ((res as any)?.message) {
+        text = (res as any).message;
+      } else if (
+        (res as any)?.tool_called === "repo_reader" &&
+        Array.isArray((res as any)?.tool_output?.data?.data?.repositories)
+      ) {
+        const count =
+          (res as any).tool_output.data.data.repositories.length;
+        text = `I found ${count} repositories. You can select one from the list to continue.`;
+      } else if (repoInfo?.fullName) {
+        text = `I’m looking at ${repoInfo.fullName}. What would you like to change about the pipeline?`;
+      } else {
+        text =
+          "I couldn’t map that request to an action yet. You can ask me to modify the pipeline, deploy settings, or AWS role.";
+      }
+
+      const assistantMessage: ChatMessage = {
+        role: "assistant",
+        content: text,
+      };
+
+      setChatMessages((prev) => [...prev, assistantMessage]);
+    } catch (e: any) {
+      console.error("[ConfigurePage] AI wizard error:", e);
+      const assistantMessage: ChatMessage = {
+        role: "assistant",
+        content:
+          "Sorry, I ran into an issue talking to the AI backend.\n\n" +
+          `Error: ${e?.message ?? "Unknown error"}`,
+      };
+      setChatMessages((prev) => [...prev, assistantMessage]);
+    } finally {
+      setChatLoading(false);
+    }
+  };
 
   const handleChatKeyDown: React.KeyboardEventHandler<HTMLTextAreaElement> = (
     e
diff --git a/client/src/store/usePipelineStore.ts b/client/src/store/usePipelineStore.ts
@@ -52,6 +52,12 @@ type PipelineActions = {
   setEditedYaml(y: string): void;
   resetYaml(): void;
   resetAll(): void;
+
+  hydrateFromWizard(payload: {
+    repo: string;
+    generatedYaml: string;
+    pipelineName?: string;
+  }): void;
 };
 
 const initial: PipelineState = {
@@ -213,6 +219,26 @@ export const usePipelineStore = create<PipelineState & PipelineActions>()(
       });
     },
 
+    hydrateFromWizard({ repo, generatedYaml, pipelineName }) {
+      set({
+        result: {
+          ...(get().result ?? {}),
+          generated_yaml: generatedYaml,
+          yaml: generatedYaml,
+          pipeline_name: pipelineName ?? "ci.yml",
+        },
+        repoFullName: repo,
+        status: "success",
+        editing: false,
+        editedYaml: undefined,
+      });
+
+      console.log(
+        "[usePipelineStore] Hydrated YAML from wizard:",
+        generatedYaml.slice(0, 80)
+      );
+    },
+
     setEditing: (b) => set({ editing: b }),
     setEditedYaml: (y) => set({ editedYaml: y }),
     resetYaml: () => set({ editedYaml: undefined }),
diff --git a/client/src/store/useWizardStore.ts b/client/src/store/useWizardStore.ts
@@ -0,0 +1,58 @@
+import { create } from "zustand";
+
+type RepoInfo = {
+  fullName: string;
+  defaultBranch?: string;
+  language?: string | null;
+  visibility?: "public" | "private";
+};
+
+type PipelineInfo = {
+  pipelineName?: string;
+  branch?: string;
+  provider?: string;
+  stages?: string[];
+};
+
+type WizardContextState = {
+  // context
+  lastToolCalled?: string;
+  repoInfo?: RepoInfo;
+  pipelineInfo?: PipelineInfo;
+
+  // setters
+  setLastToolCalled: (tool?: string) => void;
+  setRepoInfo: (info?: RepoInfo) => void;
+  setPipelineInfo: (info?: PipelineInfo) => void;
+
+  // reset (optional but useful)
+  resetWizardContext: () => void;
+};
+
+export const useWizardStore = create<WizardContextState>((set) => ({
+  lastToolCalled: undefined,
+  repoInfo: undefined,
+  pipelineInfo: undefined,
+
+  setLastToolCalled: (tool) =>
+    set(() => ({
+      lastToolCalled: tool,
+    })),
+
+  setRepoInfo: (info) =>
+    set(() => ({
+      repoInfo: info,
+    })),
+
+  setPipelineInfo: (info) =>
+    set(() => ({
+      pipelineInfo: info,
+    })),
+
+  resetWizardContext: () =>
+    set(() => ({
+      lastToolCalled: undefined,
+      repoInfo: undefined,
+      pipelineInfo: undefined,
+    })),
+}));
diff --git a/server/tools/oidc_adapter.js b/server/tools/oidc_adapter.js
@@ -6,7 +6,7 @@ export const oidc_adapter = {
   
   // ✅ Input schema for validation
   input_schema: z.object({
-    provider: z.enum(["aws", "jenkins"]),
+    provider: z.enum(["aws", "jenkins", "gcp"]),
   }),
 
   // ✅ Mock handler (replace with real API calls later)
diff --git a/server/tools/pipeline_generator.js b/server/tools/pipeline_generator.js
@@ -21,14 +21,33 @@ export const pipeline_generator = {
     template: z.enum(['node_app', 'python_app', 'container_service']),
     options: z
       .object({
-        run_tests: z.boolean().default(true),
-        include_trivy_scan: z.boolean().default(false),
+        // legacy flags
+        run_tests: z.boolean().optional(),
+        include_trivy_scan: z.boolean().optional(),
         artifact_name: z.string().optional(),
+
+        // frontend-driven config
+        nodeVersion: z.string().optional(),
+        installCmd: z.string().optional(),
+        testCmd: z.string().optional(),
+        buildCmd: z.string().optional(),
+        awsRoleArn: z.string().optional(),
+        stages: z.array(z.enum(['build', 'test', 'deploy'])).optional(),
       })
       .optional(),
   }),
 
   // 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,
+    };
+
   handler: async ({
     repo,
     branch = 'main',
@@ -236,6 +255,8 @@ export const pipeline_generator = {
     const selectedProvider = provider || inferredProvider;
     const selectedTemplate = template || inferredTemplate;
 
+    console.log('🧪 pipeline_generator normalized options:', normalized);
+
     const pipelineName = `${selectedProvider}-${selectedTemplate}-ci.yml`;
 
     // GCP path: generate a real Cloud Run workflow (GHCR -> Artifact Registry -> Cloud Run)
@@ -277,6 +298,11 @@ export const pipeline_generator = {
 
     const generated_yaml = `
 name: CI/CD Pipeline for ${repo}
+
+permissions:
+  id-token: write
+  contents: read
+
 on:
   push:
     branches:
@@ -286,26 +312,34 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Setup ${selectedTemplate === 'node_app' ? 'Node.js' : 'Python'}
-        uses: actions/setup-${
-          selectedTemplate === 'node_app' ? 'node' : 'python'
-        }@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${normalized.nodeVersion ?? '20'}
       - name: Install Dependencies
         run: ${
-          selectedTemplate === 'node_app'
+          normalized.installCmd ??
+          (selectedTemplate === 'node_app'
             ? 'npm ci'
-            : 'pip install -r requirements.txt'
+            : 'pip install -r requirements.txt')
         }
       - name: Run Tests
-        run: ${selectedTemplate === 'node_app' ? 'npm test' : 'pytest'}
+        run: ${
+          normalized.testCmd ??
+          (selectedTemplate === 'node_app' ? 'npm test' : 'pytest')
+        }
   deploy:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - name: Configure ${selectedProvider.toUpperCase()}
-        run: echo "Configuring ${selectedProvider.toUpperCase()} OIDC..."
+      - uses: actions/checkout@v4
+      - name: Configure AWS (OIDC)
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${normalized.awsRoleArn ?? 'REPLACE_ME'}
+          aws-region: us-east-1
       - name: Deploy Application
-        run: echo "Deploying ${repo} to ${selectedProvider.toUpperCase()}..."
+        run: echo "Deploying ${repo} to AWS..."
 `;
 
     return {
@@ -317,7 +351,7 @@ jobs:
         provider: selectedProvider,
         template: selectedTemplate,
         options: options || {},
-        stages: ['build', 'test', 'deploy'],
+        stages: normalized.stages ?? ['build', 'test', 'deploy'],
         generated_yaml,
         repo_info: repoInfo,
         created_at: new Date().toISOString(),
diff --git a/server/tools/repo_reader.js b/server/tools/repo_reader.js
