Repository navigation
Clear the redesign PR's merge conflicts with main - #9
Merged
gothicscientist merged 7 commits intoNov 3, 2026
Merged
Conversation
Deploy Strata with zero-idle workers and visitor-supplied AI keys
PR #8 conflicted with main after PR #7 merged, so GitHub could not build or test the merged result. Conflicts in SiteFooter and AnalysisDocument are resolved in favour of the redesign's markup, with main's two changes carried across: - key/value values wrap anywhere instead of overflowing (the .kv grid already uses minmax(0, 1fr)); - the rail's Assistant readout says "bring your own API key" when the server has no provider, matching visitor-supplied keys. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HEuHS4j3Gtr3f1zAaXvqFB
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.
Requested by Bharat · project thread
Why
Every CI run on
mainand on #8 is green, but #8 went into conflict withmainonce #7 merged, so GitHub can't build or test the merged result and #8 can't merge.What
This merges
maininto the redesign branch. It targets #8's branch, so merging it updates #8.SiteFooter.tsx: keeps the redesign's one-line footer. The server status it used to show lives in the rail now.AnalysisDocument.tsx: keeps the redesign's.kvpanels. Main's overflow fix is carried across (min-w-0 [overflow-wrap:anywhere]on values;.kvalready usesminmax(0, 1fr)).SiteHeader.tsx: the rail's Assistant readout now says "bring your own API key", matching Deploy Strata with zero-idle workers and visitor-supplied AI keys #7's wording for visitor-supplied keys.Checks
In
apps/web, run locally:pnpm typecheck,pnpm test(53 passed) andpnpm buildall pass.Generated by Claude Code