Repository navigation
Merge upstream v0.1.1-nightly.20261016.3218 - #8
Merged
mohan6623 merged 14 commits intoOct 17, 2026
Merged
Conversation
…gg#20147) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dows (pingdotgg#20162) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#20133) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…arent (pingdotgg#20160) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#15945) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Michel-Liao <107891771+Michel-Liao@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
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.
Claude Code resolved the conflicts in this merge of upstream
v0.1.1-nightly.20261016.3218. Typecheck passed.The sync merges this PR by itself, which builds and publishes the update.
Claude's summary
All 8 conflicts are resolved and staged, and no conflict markers remain. Nothing has been committed. Most of the conflicts came from upstream's comment-pruning pass (pingdotgg#19559) landing on lines the fork had also edited.
Checks:
vp installran andensure:electronpassed. The lockfile didn't conflict but did change, and I kept the merged version.vpr typechecknow passes with 0 errors after one fix, described underChatView.tsx. All the unit tests for the touched files pass: 386 in web across 6 files, 59 for the supervisor, 168 for settings and 8 forcliRelease.The web test run rewrote
apps/web/src/routeTree.gen.ts. That wasn't part of the merge, so I put it back to the staged version.How each conflict was resolved:
packages/shared/src/cliRelease.ts: kept the fork'smohan6623/t3coderelease repo and its comment. Took upstream's removal of the header doc comment.packages/contracts/src/settings.ts: kept the fork'scompactBeforeSendEnabledsetting and its comment. Took upstream's removal of the rich-text comment.packages/client-runtime/src/connection/supervisor.ts: kept the fork's 30-second retry cap and its comment, next to upstream's shorter timeout comment. Took upstream's removal of the doc comment onretryDelayMs.apps/web/src/components/ui/sidebar.tsx: kept the fork's sidebar-on-hover code (peekState,schedulePeek,peeking). Took upstream's removal of the shadcn boilerplate comments.apps/web/src/components/chat/MessagesTimeline.tsx: kept the fork's preview close-delay and rail-width constants, with upstream's shorter comment on the mouse-release helper.apps/web/src/components/chat/ChatCanvas.tsx: kept the fork'sCHAT_LANE_SELECTOR. Took upstream's removal of the doc comments.apps/web/src/components/chat/ChatComposer.tsx, three conflicts:if (footer && !staticContent)check without its comment, since upstream removed that comment.controlsInStrip/restingLayoutlogic.restingActionsElementwidth measurement. It isn't new upstream code: it was already in the shared base, the fork replaced it withuseComposerActionRow, and upstream only touched the lines around it.apps/web/src/components/ChatView.tsx, two conflicts:setTimelineLiveFollow(true)rather than upstream'ssetTimelineLiveFollowEnabled. The fork wraps that setter to skip repeated same-value updates. I dropped the comment as upstream did.inlineSize={previewPanelInlineSize}on the sheet, but typecheck failed on it. The fork's perf commit 25f8559 had already taken that prop out (the panel now owns its width), and upstream had only removed the comment above it. So the line is gone along with the comment.claude-summary.mdandconflicted-files.txtwere already untracked in the worktree before I started, and I left them alone.