fix: resolve 2026-03-04-lzdy branch conflicts — Dr. Bot branding, credential fallback, new scripts#106
Draft
Copilot wants to merge 3 commits into
Draft
fix: resolve 2026-03-04-lzdy branch conflicts — Dr. Bot branding, credential fallback, new scripts#106Copilot wants to merge 3 commits into
Copilot wants to merge 3 commits into
Conversation
…llback, new scripts, skills Co-authored-by: asperpharma <252395498+asperpharma@users.noreply.github.com>
Co-authored-by: asperpharma <252395498+asperpharma@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix conflicts in branch for 2026-03-04-lzdy
fix: resolve 2026-03-04-lzdy branch conflicts — Dr. Bot branding, credential fallback, new scripts
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.
The
2026-03-04-lzdybranch diverged frommainwith improvements that couldn't cleanly merge. This PR cherry-picks the meaningful changes onto the currentmainbase, resolving conflicts.beauty-assistant edge function
"You are the **Asper Dual-Voice Concierge**..."→"You are **Dr. Bot** — the Asper Dual-Voice Concierge..."SUPABASE_URL/SUPABASE_SERVICE_ROLE_KEYare absent:declare const Denodeclaration, and// @ts-expect-errorannotations for Deno URL importsCI workflow fixes
azure-webapps-node.yml: addedif: secrets.AZURE_WEBAPP_PUBLISH_PROFILE != ''— was failing on everymainpush due to unconfigured Azure credentials and placeholderyour-app-namesync-file-changes-to-lovable.yml/sync-issues-prs-to-lovable.yml: curl webhook calls now use|| echofallback so a non-responsive Lovable endpoint doesn't fail the workflowNew files from lzdy branch
scripts/brain-check.js— Beauty Assistant (edge function) connectivity check (npm run brain)scripts/sync-check.js— combined frontend + brain health check (npm run sync:check)skills/code-connect-components/SKILL.md,skills/get-pr-comments/SKILL.md,.agents/skills/code-connect-components/SKILL.md,skills-lock.json— Cursor skill definitionspackage.json / README
health,brain,sync:checkscripts; preserved existingsync/sync:dry/sync:publish(Shopify catalog) scripts✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.