Skip to content

Merge upstream v0.1.1-nightly.20261016.3190 - #7

Merged
mohan6623 merged 224 commits into
custom/usage-badgefrom
sync/v0.1.1-nightly.20261016.3190
Oct 16, 2026
Merged

mohan6623 merged 224 commits into
custom/usage-badgefrom
sync/v0.1.1-nightly.20261016.3190

Conversation

@mohan6623

Copy link
Copy Markdown
Owner

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:electron ran 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:
    • I kept both sides: the fork's close-delay and rail-zone constants, plus upstream's new onMouseButtonsReleased helper.
    • On the minimap button, I kept the fork's delayed close (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:
    • Imports: both sides' icons are imported (InfoIcon and RotateCwIcon from the fork, ShieldQuestionIcon from upstream).
    • Reconnect handler: I switched it to upstream's plain-function-plus-useStableCallback style and kept the fork's brief spin of the retry icon after a click.
    • Banner actions: I kept the fork's "Retry now" icon button, now calling the stable handler. It still shows while a reconnect is pending, which upstream's version would hide.
    • List of values the banner memo depends on: it now has the stable handler and the fork's spin state.
    • Right-panel sheet: I took upstream's getShortcutContextStable. I dropped the inlineSize={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 a Fork: comment. It passes now and is staged.

maria-rcks and others added 30 commits October 13, 2026 23:22
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>
…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>
… 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>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#16102)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
juliusmarminge and others added 25 commits October 15, 2026 17:03
…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>
)

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: maria-rcks <maria@kuuro.net>
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.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>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…chip (pingdotgg#20102)

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>
Copilot AI balanced review requested due to automatic review settings October 16, 2026 07:03
@mohan6623
mohan6623 merged commit 7e7d1af into custom/usage-badge Oct 16, 2026
@mohan6623
mohan6623 deleted the sync/v0.1.1-nightly.20261016.3190 branch October 16, 2026 07:03

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 16, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-16T07:05:05.658637Z 30fa8ba PR opened
🔒 Security Review ✅ Completed 2026-10-16T07:06:18.438768Z 30fa8ba PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.