Resolve PR 432 merge conflicts against current main#434
Merged
Conversation
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…rovider # Conflicts: # apps/server/src/doctor.ts # apps/server/src/provider/Layers/ProviderHealth.ts # apps/server/src/serverLayers.ts # apps/server/src/sme/Layers/SmeChatServiceLive.ts # apps/server/src/sme/authValidation.ts # apps/web/src/appSettings.ts # apps/web/src/components/home/home-utils.ts # apps/web/src/components/sme/smeConversationConfig.ts # apps/web/src/routes/_chat.settings.tsx # packages/contracts/src/providerRuntime.ts
Add PR_REVIEW_PLAN.md describing a phased plan to finish the PR review cockpit. Update PrReviewShell.tsx to enhance the action rail and expanded review panel: add formatting helpers for review decisions and conflict status, compute file stats, surface approval blockers and gating logic, show review decision with tone, file impact summary, and blocker/count UI, and restructure the expanded area into three info cards (Review decision, File impact, Approval status). Also adjust button layout and disable logic for Approve and minor spacing/styling tweaks.
Co-authored-by: BunsDev <68980965+BunsDev@users.noreply.github.com>
Co-authored-by: BunsDev <68980965+BunsDev@users.noreply.github.com>
Copilot created this pull request from a session on behalf of
BunsDev
April 13, 2026 06:15
View session
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
github-actions
Bot
added
the
vouch:unvouched
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.
What Changed
This updates the PR 432 branch onto current
main, resolves the remaining merge conflicts, and preserves the intended Copilot/provider-picker and PR review changes instead of letting newer mainline work overwrite them.Conflict resolution
apps/server/src/doctor.tsso provider setup output keeps Copilot onboarding and the newer Claude auth-token guidance.apps/server/src/sme/Layers/SmeChatServiceLive.ts, including Claude-only SME support and auth-token-helper-based setup.claudeAuthTokenHelperCommandinapps/web/src/appSettings.tsso merged settings/schema changes stay consistent.PR review shell
apps/web/src/components/pr-review/PrReviewShell.tsxwith newer mainline review metadata.Merged mainline updates
mainso the branch reflects current server/web contracts and can move forward without manual conflict cleanup.Why
PR 432 had diverged from
mainenough to stop merging cleanly. The goal here is to rebase the branch onto current behavior while keeping the Copilot/provider-picker and review UX work intact, rather than choosing one side of the conflicts and regressing the other.UI Changes
Checklist