Repository navigation
Merge upstream v0.1.1-nightly.20261016.3190 - #7
Merged
mohan6623 merged 224 commits intoOct 16, 2026
Merged
Conversation
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#12469) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…tgg#12465) Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…nger drop clients (pingdotgg#19205) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#19207) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… Google group (pingdotgg#18955) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nt finishes (pingdotgg#18996) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#19162) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…otgg#19160) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…gdotgg#15864) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…mits (pingdotgg#11368) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…hey made unnecessary (pingdotgg#19213) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#15872) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…se the child (pingdotgg#14416) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: SAPHID <saphid@users.noreply.github.com>
…atabases (pingdotgg#19226) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: Alex Southwell <saphid@gmail.com>
…ingdotgg#18890) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#19291) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#16102) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…19435) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…otgg#19437) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
pingdotgg#20077) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: scratchyone <11479077+scratchyone@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…heir numbers (pingdotgg#20080) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#20061) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#18556) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…chip (pingdotgg#20102) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#20114) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…read (pingdotgg#19915) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#18075) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ucceeds (pingdotgg#20065) Co-authored-by: Aaron Queen <bompus@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ery child (pingdotgg#20062) Co-authored-by: Aaron Queen <bompus@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#20066) Co-authored-by: Aaron Queen <bompus@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#20070) Co-authored-by: Aaron Queen <bompus@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#20120) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <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.3190. Typecheck passed.The sync merges this PR by itself, which builds and publishes the update.
Claude's summary
All four conflicts are resolved and staged, and no conflict markers are left. Typecheck passes with 0 errors, and the tests for the changed files pass: web 382, client-runtime 59, ssh 30. The lockfile didn't conflict, so I didn't run
vp install.ensure:electronran without problems. Nothing is committed.Conflicts
packages/client-runtime/src/connection/supervisor.ts: I kept the fork's 30-second retry cap (upstream uses 300 seconds) and its comment. I also kept upstream's new comment on the connection timeout budget.packages/ssh/src/tunnel.ts: upstream (fix(ssh): reconnecting keeps the remote server and its agents running pingdotgg/t3code#19432) made the same fix as the fork: forget the tunnel entry before closing it, so the remote server keeps running. I took upstream's shorter comment. The fork's longer timeouts were not in the conflict and are still there: 10 s to reuse a remote server, and 10 s total / 4 s per probe to check an open tunnel.apps/web/src/components/chat/MessagesTimeline.tsx:onMouseButtonsReleasedhelper.onMouseLeave={scheduleClose}). I combined it with upstream's check that stops the preview from following the pointer during a text-selection drag.apps/web/src/components/ChatView.tsx:InfoIconandRotateCwIconfrom the fork,ShieldQuestionIconfrom upstream).useStableCallbackstyle and kept the fork's brief spin of the retry icon after a click.getShortcutContextStable. I dropped theinlineSize={previewPanelInlineSize}line it brought back, because the fork removed it on purpose in its panel-resize performance commit and the variable no longer exists.Other change the merge needed
packages/ssh/src/tunnel.test.ts: upstream added a test ("replaces a stale SSH forward…") that advances the test clock 2 seconds, which matches upstream's tunnel check. With the fork's 10-second check it timed out, so I changed it to advance 10 seconds and added aFork:comment. It passes now and is staged.