Merge upstream: server self-update, thread branch drift fixes, sidebar refresh#7
Merged
Merged
Conversation
…ingdotgg#4275) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…g#4286) Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: codex <codex@users.noreply.github.com>
…otgg#2284) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>
…tream-updates # Conflicts: # apps/server/src/ws.ts
|
Macroscope skipped reviewing this pull request. Per-review cost limit exceeded (workspace setting). This review would cost an estimated $13.99, which exceeds your per-review limit of $10.00. The top 3 files driving up this estimate:
Tip To get this pull request reviewed, you can:
|
jetblk
added a commit
that referenced
this pull request
Jul 23, 2026
Records upstream/main (2d31cb0) as merged. Its content already landed in main via the squash-merge of #7; this commit only restores the git ancestry so the fork stays 'fully merged' and future upstream merges don't re-present these commits. No file changes (tree identical to origin/main). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
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.
Brings in 5 new commits from
pingdotgg/t3codemain (main..upstream/main), evaluated per the fork's upstream-merge workflow. Full merge (no cherry-pick) to keep the RPC contract in sync between fork servers and upstream desktop/mobile clients.Commits merged
2d31cb022(pingdotgg#2284)ab4a88386(pingdotgg#4286)serverUpdateServerRPC,selfUpdate, service CLI)593289c3c(pingdotgg#4268)78a0ea55c(pingdotgg#4275)bc9428a06(pingdotgg#3949)Conflict resolution
One mechanical conflict in
apps/server/src/ws.ts: upstream's newserverUpdateServerhandler and the fork'sserverGetProviderUsagehandler were inserted at the same slot in the WS method map. Both handlers kept. Imports andyield*service bindings had already auto-merged; contracts (rpc.ts) carry both method definitions. No fork-identity files (nightly-fork.yml,app.config.ts) collided.Verification
@t3tools/contracts,t3(server),@t3tools/webNote: pingdotgg#4286 adds a server self-update feature; it merged without touching the fork's
nightly-fork.ymlrelease pipeline.🤖 Generated with Claude Code
Note
Add server self-update RPC, branch drift detection, and sidebar v2 refresh
server.updateServerWebSocket RPC with aServerUpdateActionUI component that triggers server self-update, manages a 12-minute pending timeout, and offers a copy-to-clipboard fallback for manual updates vianpx t3@<version>.resolveServerSelfUpdateCapabilityto detect update paths (boot-service, respawn, desktop-managed) from environment capabilities; surfaces actionable guidance and the update action in the composer version-mismatch banner and connections settings.resolveLocalCheckoutBranchMismatchto detect when a server thread's branch diverges from the local git checkout, and adds handlers inChatViewto reconcile the mismatch or switch checkout.resolveThreadPrto accept a structured{ threadBranch, gitStatus, hasDedicatedWorktree }object, returning the PR for dedicated worktree threads regardless of stale/missing branch metadata.SidebarV2with a dropdown menu, adds a rich per-row hover tooltip (SidebarV2ThreadTooltip) showing branch, environment, model, and mismatch warnings, and updates sidebar color tokens to zinc-based design tokens.t3 serviceCLI subcommands (install, update, uninstall, status) fromconnect.tsinto a dedicatedservice.tsmodule and exposes them in the CLI.ensurePinnedRuntimeInstalledto serialize concurrent pinned runtime installs with a sentinel-based validity check and a 10-minute npm timeout.networkStatuson mobile no longer classifies devices as offline whenisInternetReachableis false butisConnectedis true.Macroscope summarized 448328f.