fix: Adjustments from trial run (#14)

chriswblake · web-flow · commit 812854a9cadd · 2025-04-07T15:59:51.000-05:00
diff --git a/.github/steps/1-step.md b/.github/steps/1-step.md
@@ -2,8 +2,6 @@
 
 <img width="150" align="right" alt="copilot logo" src="https://github.com/user-attachments/assets/4d22496d-850b-4785-aafe-11cba03cd5f2" />
 
-Welcome to another Skills exercise!
-
 In the [Getting Started with GitHub Copilot](https://github.com/skills/getting-started-with-github-copilot) exercise, we were introduced to the Mergington High School's extracurricular activities website, which allowed students to sign up for events.
 
 And now we have a problem... but.. it's a good one! More teachers are asking to to use it! 🎉
@@ -41,7 +39,7 @@ graph LR
 
 ### :keyboard: Activity: Get to know your environment
 
-Let's start up our development environment and refamiliarize ourself with the extracurricular activity application.
+Before we dive into MCP, let's start up our development environment and refamiliarize ourself with the extracurricular activity application.
 
 1. Right-click the below button to open the **Create Codespace** page in a new tab. Use the default configuration.
 
@@ -83,8 +81,6 @@ Let's start up our development environment and refamiliarize ourself with the ex
 
 ### :keyboard: Activity: Add the GitHub MCP server
 
-Since we are using GitHub, we have asked our fellow teachers to submit their ideas and bugs as issues (instead of email).
-
 1. Inside your codespace, open the **Copilot Chat** panel and verify **Agent** mode is selected.
 
    <img width="200" alt="image" src="https://github.com/user-attachments/assets/201e08ab-14a0-48bf-824e-ba4f8f43f8ab" />
diff --git a/.github/steps/2-step.md b/.github/steps/2-step.md
@@ -33,61 +33,45 @@ Isn't that cool?! Now let's do it! 👩‍🚀
    > ![Static Badge](https://img.shields.io/badge/-Prompt-text?style=social&logo=github%20copilot)
    >
    > ```prompt
-   > Are their any other repositories for organizing extra curricular actitivities?
+   > Are their any other repositories for organizing extra curricular activities?
    > ```
 
 4. When an MCP tool is required, Copilot will ask permission. Click **Continue**.
 
    <img width="250" alt="request permission dialog" src="https://github.com/user-attachments/assets/d14ea944-5443-4b8a-a4d2-ae677fdb274c" />
 
-5. Ask Copilot to describe one of the projects.
+5. Ask Copilot to describe one of the projects. Explore until you find something you like.
 
    > ![Static Badge](https://img.shields.io/badge/-Prompt-text?style=social&logo=github%20copilot)
    >
    > ```prompt
    > Please look at the code for the 3rd option and give me a detailed description of the features.
    > ```
 
-6. (optional) You might pick a project that is still young. If that happens, Copilot might say there isn't much to describe. Instead just ask to review a different one. Example:
+6. Use Copilot to compare and generate ideas for enhancements.
 
    > ![Static Badge](https://img.shields.io/badge/-Prompt-text?style=social&logo=github%20copilot)
    >
    > ```prompt
-   > Ok. How about the first one then?
+   > Please compare these features to our project. Which would be new?
    > ```
 
-7. Use Copilot to compare and generate ideas for enhancements.
-
-   > ![Static Badge](https://img.shields.io/badge/-Prompt-text?style=social&logo=github%20copilot)
-   >
-   > ```prompt
-   > Which of these features would be new for our project?
-   > ```
-
-8. Nice! Let's have Copilot create issues to save these ideas.
+7. Nice! Let's have Copilot create issues to save these ideas.
 
    > ![Static Badge](https://img.shields.io/badge/-Prompt-text?style=social&logo=github%20copilot)
    >
    > ```prompt
    > I like it. Let's create issues for these.
    > ```
 
-9. Copilot will ask for permssion to create issues on your repository. Click **Continue** for each new issue.
+8. Copilot will ask for permission to create issues on your repository. Click **Continue** for each new issue.
 
    <img width="250" alt="request permission dialog" src="https://github.com/user-attachments/assets/52635294-950a-4168-b71e-498eb769f3af" />
 
-10. With the new issues created, Mona should already be busy checking your work. Give her a moment and keep watch in the comments. You will see her respond with progress info and the next lesson.
-
-11. (Optional) Let's see if the author has other projects we might be interested in.
+9. Since we are done researching, let's finish this chat session to clear the context. At the top of the **Copilot Chat** panel, click the **New Chat** icon (plus sign).
 
-    > ![Static Badge](https://img.shields.io/badge/-Prompt-text?style=social&logo=github%20copilot)
-    >
-    > ```prompt
-    > What was the name of the owner of the repo we just reviewed?
-    > Search GitHub and give me a summary of other projects they have recently worked on.
-    > ```
+10. With the new issues created, Mona should already be busy checking your work. Give her a moment and keep watch in the comments. You will see her respond with progress info and the next lesson.
 
-    > 🪧 **Note:** We explicitly asked about the owner to help guide Copilot with the relative reference.
 
 > [!NOTE]
 > The Model Context Protocal (MCP) landscape is quickly evolving. Many servers, including the [Official GitHub MCP server](https://github.com/github/github-mcp-server) are in active development and do not have full parity with their stable APIs.
diff --git a/.github/steps/3-step.md b/.github/steps/3-step.md
@@ -3,7 +3,7 @@
 Great workd doing that research and finding a potential collaboration opportunity.
 Not only did we find some new ideas to help organize extracurricular activies, but we did all that quickly too.
 
-Plenty of time to focus on the fun stuff, teaching our awesome students! 🌱
+Plenty of time to focus on the fun stuff, like teaching our awesome students! 🌱
 
 Btw, it seems the teachers have also been active.
 Looks like they submitted some bugs and requests! Perfect! 🚀
@@ -19,9 +19,11 @@ Now, let's use our MCP server's tools and Copilot to do a bit of triage and get
    > ![Static Badge](https://img.shields.io/badge/-Prompt-text?style=social&logo=github%20copilot)
    >
    > ```prompt
-   > How many open issues are there?
+   > #codebase How many open issues are there?
    > ```
 
+   > :placard: **Note:** In our tests, we found that Copilot sometimes gets confused about the repository owner here. We chose to add `#codebase` to reduce this ambiguity and make the lesson smoother.
+
 3. Ask Copilot to summarize the important issues.
 
    > ![Static Badge](https://img.shields.io/badge/-Prompt-text?style=social&logo=github%20copilot)
@@ -33,24 +35,19 @@ Now, let's use our MCP server's tools and Copilot to do a bit of triage and get
 
 4. Review the suggested issues. If Copilot didn't give a specific recommendation, try providing some feedback to narrow the results.
 
-5. With the list narrowed, ask copilot to implement one.
+5. With the list narrowed, ask copilot to implement an issue. **Mona won't grade if the changes work, just that an attempt was made.**
 
    > ![Static Badge](https://img.shields.io/badge/-Prompt-text?style=social&logo=github%20copilot)
    >
    > ```prompt
-   > #codebase Let's do the first one. Add a comment that I am working on it and
-   > assign it to me. Start a new branch, make the changes, then push them
-   > and start a pull request. Make sure to link this issue and the new PR.
+   > #codebase Let's do the first one. Follow these steps:
+   > 1. Checkout a new local branch for making our changes.
+   > 2. Make the changes then confirm with me that they look correct.
+   > 3. Push the changes and start a pull request. Make sure to link this issue and the new PR.
    > ```
 
    > ⚠️ **Warning:** Always verify the the actions Copilot is asking to perform, especially with the external abilities provided by an MCP server.
 
-6. Follow Copilot's recommendations to make the changes and create a pull request.
-
-   - You can press the **Keep** buttons as changes are made. However, do **NOT** press the **Done** button, which will clear the context.
-   - When the changes are finished, you can optionally preview the website to see if they worked. **This won't be checked.**
-   - Remember, Copilot is conversational and iterative. You can always pause and provide additional guidance. Pausing is also useful if Copilot is acting slow. The servers might be busy! 🕝
-
 7. Once the pull request is created, Mona will start checking your work. Give her a moment and keep watch of the comments. You will see her respond with progress info and the next step!
 
 <details>
diff --git a/.github/steps/4-step.md b/.github/steps/4-step.md
@@ -9,17 +9,17 @@ While AI assistants like GitHub Copilot can dramatically improve productivity, i
 
 ### :keyboard: Activity: Review and merge the AI solution
 
-1. Examine the new pull request Copilot helped create. **Tip:** open it in a new window.
+1. Open the new pull request created by Copilot in a new tab.
 
    [![Examine the pull request](https://img.shields.io/badge/-Open%20Pull%20Request-1f883d?logo=github)]({{{pull_request_url}}})
 
    > ✨ **Bonus:** If your Copilot subcription provides it, you can also use a specialised version of Copilot to [review the changes](https://docs.github.com/en/copilot/using-github-copilot/code-review/using-copilot-code-review?tool=webui).
 
-2. Once you're satisfied with the changes, merge the pull request and verify the linked issue also closed.
+2. Review the changes. When you are satisfied, merge the pull request and verify the linked issue also closed.
 
 3. Return to VS code and the active **Copilot Chat** session.
 
-   > 🪧 **Tip:** If you previously clicked Done and need to return to a previous conversation, use the **Show Chats** button at the top of the Copilot Chat panel.
+   > 🪧 **Tip:** If you previously clicked Done and need to return to a previous conversation, use the **Show Chats** button at the top of the Copilot Chat panel to restore it.
 
 4. Ask Copilot to add a comment to the issue we just finished, and to say thanks for the comments and ideas.
 
diff --git a/.github/workflows/0-start-exercise.yml b/.github/workflows/0-start-exercise.yml
@@ -10,7 +10,6 @@ permissions:
   actions: write # Disable/enable workflows
   issues: write # Create issue and comment on issues
 
-
 env:
   STEP_1_FILE: ".github/steps/1-step.md"
 
@@ -22,8 +21,7 @@ jobs:
     uses: skills/exercise-toolkit/.github/workflows/start-exercise.yml@v0.2.0
     with:
       exercise-title: "Integrate MCP with Copilot"
-      intro-message: "Welcome to the exercise! This exercise will help you learn how to integrate the Model Context Protocol (MCP) with GitHub Copilot."
-
+      intro-message: "This exercise will help you learn how to expand GitHub Copilot's capabilities with a Model Context Protocol (MCP)."
 
   post_next_step_content:
     name: Post next step content
@@ -32,7 +30,6 @@ jobs:
     env:
       ISSUE_URL: ${{ needs.start_exercise.outputs.issue-url }}
 
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/README.md b/README.md
@@ -1,26 +1,26 @@
 # Integrate MCP with GitHub Copilot
 
-_Learn how to integrate Model Context Protocol (MCP) with GitHub Copilot in less than an hour._
+_Learn how to give GitHub Copilot more tools to expand the capabilities of your development workflow. All in less than an hour!_
 
 ## Welcome
 
 - **Who is this for**: Developers looking to enhance their AI-assisted workflows, GitHub Copilot users, and AI enthusiasts.
-- **What you'll learn**: We'll introduce MCP basics, GitHub MCP server setup, and integration with Copilot Agent Mode.
-- **What you'll build**: You will fix a bug that was reported on your website's repository.
+- **What you'll learn**: We'll introduce MCP basics, a GitHub MCP server setup, and integration with Copilot Agent Mode.
+- **What you'll build**: A mixed development workflow that uses GitHub Copilot to manage issues while upgrading the extra curricular activities website for Mergington High School.
 - **Prerequisites**: [Getting Started with Copilot](https://github.com/skills/getting-started-with-github-copilot) Exercise
 - **How long**: This exercise takes less than one hour to complete.
 
 In this exercise, you will:
 
-1. Configure a GitHub MCP server
-2. Integrate MCP with GitHub Copilot Agent Mode
-3. Learn how to use MCP Servers to supercharge your workflow.
+1. Integrate a GitHub MCP server with GitHub Copilot.
+2. Delegate Copilot to research similar projects and open issues.
+3. Ask Copilot to find an important issue and implement it from idea to pull request.
+4. Add comments to a recently closed issue.
 
 ### How to start this exercise
 
 > [!IMPORTANT]
-> This exercise may not explain the Copilot basics that were introduced in the [Getting Started with Copilot](https://github.com/skills/getting-started-with-github-copilot) exercise. If you are new to
-Copilot we recommend starting with that one.
+> This exercise may not explain the Copilot basics that were introduced in the [Getting Started with Copilot](https://github.com/skills/getting-started-with-github-copilot) exercise. If you are new to Copilot we recommend starting with that one.
 
 Simply copy the exercise to your account, then give your favorite Octocat (Mona) **about 20 seconds** to prepare the first lesson, then **refresh the page**.
 
