Resolve merge conflicts: add brain/sync-check scripts, dual API key support, and Gemini direct streaming to beauty-assistant#104
Draft
Copilot wants to merge 2 commits into
Draft
Conversation
…tant/index.ts; add brain-check.js and sync-check.js scripts Co-authored-by: asperpharma <252395498+asperpharma@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix merge conflicts in multiple files
Resolve merge conflicts: add brain/sync-check scripts, dual API key support, and Gemini direct streaming to beauty-assistant
Mar 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges diverged changes from
copilot/fix-merge-conflictsintomainacross four files. The feature branch added new operational scripts, npm shortcuts, and a significant refactor of the beauty-assistant edge function; main had moved ahead with a newerjsdomversion. Conflicts resolved by taking the best of both.README.md
package.json
health,brain,sync:checknpm scriptsjsdom@^28.1.0frommain(dropped^20.0.3from feature branch)New scripts
scripts/brain-check.js— HTTP GET probe against the beauty-assistant edge functionscripts/sync-check.js— parallel probe of frontend/health+ beauty-assistant; exits non-zero on any failuresupabase/functions/beauty-assistant/index.ts
declare const Denoambient declaration (fixes TS compiler errors on Deno URL imports; paired with// @ts-expect-error)Deno.env.get(...)!non-null assertions with?? ""/ guarded patternsGEMINI_API_KEY ?? LOVABLE_API_KEYstreamGenerateContentSSE) added as a second path whenLOVABLE_API_KEYis absent:if (!response.body) { controller.close(); return; }) before allgetReader()calls💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.