Resolve PR #395 merge conflicts against main#428
Merged
Conversation
- Replace legacy auth/session RPC flow with connect challenge handling - Surface gateway error details and pairing hints in diagnostics - Update contract and settings UI to show the new handshake fields
- Document planned sidebar metadata and branch picker improvements - Add design guidance for dense, inline state visibility
- Increase the width of the viewport width and height inputs - Prevent clipped values in the preview panel
- Add gateway client handshake with signed device identity - Persist encrypted gateway config, device keys, and tokens - Thread OpenClaw auth state through server and UI
- Add `OpenclawGatewayConfigLive` to the server runtime layer - Remove the Solar Witch theme definitions from the web styles
…, Solar Witch theme, and legacy import banner gating Agent-Logs-Url: https://github.com/OpenKnots/okcode/sessions/9615af9c-7cb2-409b-93c1-541b906a4a67 Co-authored-by: BunsDev <68980965+BunsDev@users.noreply.github.com>
Agent-Logs-Url: https://github.com/OpenKnots/okcode/sessions/9615af9c-7cb2-409b-93c1-541b906a4a67 Co-authored-by: BunsDev <68980965+BunsDev@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Agent-Logs-Url: https://github.com/OpenKnots/okcode/sessions/fd5aa06f-86c4-4710-b12f-0d87f6a9c8f8 Co-authored-by: BunsDev <68980965+BunsDev@users.noreply.github.com>
Co-authored-by: BunsDev <68980965+BunsDev@users.noreply.github.com>
Agent-Logs-Url: https://github.com/OpenKnots/okcode/sessions/de1775b2-7460-4cb0-b19c-512a47ed8242 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 04:14
View session
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
github-actions
bot
added
size:L
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 branch with the conflict resolutions needed to land PR #395 cleanly on current
main. The merge keeps the gateway-auth work from PR #395 while preserving newer upstream changes that touched the same areas.Server gateway/auth path
OpenclawGatewayConfig.Upstream feature preservation
mainimplementations for the settings route split, WS/native API surface, SME service changes, and server WS routing where those supersede the older PR Add OpenClaw gateway auth, config persistence, and handshake updates #395 versions.main.Docs/theme merge cleanup
DESIGN.mdand theme definitions so the branch reflects the current theme/documentation state without conflict markers or duplicate blocks.Follow-up cleanup
OpenclawGatewayConfig.tsafter the merge resolution.Why
PR #395 had drifted far enough from
mainthat it no longer merged mechanically. This resolves the overlap in a way that keeps the intended OpenClaw gateway auth/config changes from PR #395 without regressing newer platform, settings, contract, and server work that already landed onmain.UI Changes
No intended UI behavior change beyond keeping the
main-side settings route/theme structure intact during the merge.Checklist