Merge main into branch and resolve conflicts

Open Copilot opened this issue 2 months ago • 1 comments

🎉 Thanks for submitting a pull request! 🎉

Summary

Merged main branch into copilot/sub-pr-7584 to incorporate latest upstream changes.

Resolved merge conflicts between image handling refactor (using @netlify/images) and AI Gateway feature additions:

src/utils/proxy.ts: Combined imports - preserved both ImageHandler from @netlify/images and AIGatewayContext from @netlify/ai/bootstrap
package-lock.json: Regenerated lockfile via npm install to merge dependency trees from both branches

For us to review and ship your PR efficiently, please perform the following steps:

[ ] Open a bug/issue before writing your code 🧑‍💻. This ensures we can discuss the changes and get feedback from everyone that should be involved. If you're fixing a typo or something that's on fire 🔥 (e.g. incident related), you can skip this step.
[ ] Read the contribution guidelines 📖. This ensures your code follows our style guide and passes our tests.
[ ] Update or add tests (if any source code was changed or added) 🧪
[ ] Update or add documentation (if features were changed or added) 📝
[ ] Make sure the status checks below are successful ✅

A picture of a cute animal (not mandatory, but encouraged)

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Nov 27 '25 19:11 Copilot

Just as a heads up, I was blocked by some firewall rules while working on your feedback. Expand below for details.

[!WARNING]

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

https://api.github.com//advisories

Triggering command: /home/REDACTED/work/_temp/ghcca-node/node/bin/node /home/REDACTED/work/_temp/ghcca-node/node/bin/node --enable-source-maps /home/REDACTED/work/_temp/copilot-developer-action-main/dist/index.js (http block)

If you need me to access, download, or install something from one of these locations, you can either:

Configure Actions setup steps to set up my environment, which run before the firewall is enabled

Add the appropriate URLs or hosts to the custom allowlist in this repository's Copilot coding agent settings (admins only)

Nov 27 '25 19:11 Copilot