Skip to content

Merge upstream: server self-update, thread branch drift fixes, sidebar refresh#7

Merged
jetblk merged 6 commits into
mainfrom
t3code/evaluate-upstream-updates
Jul 23, 2026
Merged

Merge upstream: server self-update, thread branch drift fixes, sidebar refresh#7
jetblk merged 6 commits into
mainfrom
t3code/evaluate-upstream-updates

Conversation

@jetblk

@jetblk jetblk commented Jul 23, 2026

Copy link
Copy Markdown
Owner

Brings in 5 new commits from pingdotgg/t3code main (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

Commit Summary
2d31cb022 (pingdotgg#2284) Prevent silent thread branch drift + better PR fetching
ab4a88386 (pingdotgg#4286) Remote server updates + standalone service management (adds serverUpdateServer RPC, selfUpdate, service CLI)
593289c3c (pingdotgg#4268) Refine light-mode sidebar surfaces (web + mobile)
78a0ea55c (pingdotgg#4275) Copy branch name via right-click in the branch selector
bc9428a06 (pingdotgg#3949) Mobile: don't mark Android VPN/Tailscale as offline when connected

Conflict resolution

One mechanical conflict in apps/server/src/ws.ts: upstream's new serverUpdateServer handler and the fork's serverGetProviderUsage handler were inserted at the same slot in the WS method map. Both handlers kept. Imports and yield* 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

  • Typecheck clean: @t3tools/contracts, t3 (server), @t3tools/web
  • Provider-usage tests green: server 44, contracts 191, client-runtime 453

Note: pingdotgg#4286 adds a server self-update feature; it merged without touching the fork's nightly-fork.yml release pipeline.

🤖 Generated with Claude Code

Note

Add server self-update RPC, branch drift detection, and sidebar v2 refresh

  • Introduces a server.updateServer WebSocket RPC with a ServerUpdateAction UI component that triggers server self-update, manages a 12-minute pending timeout, and offers a copy-to-clipboard fallback for manual updates via npx t3@<version>.
  • Adds resolveServerSelfUpdateCapability to 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.
  • Adds resolveLocalCheckoutBranchMismatch to detect when a server thread's branch diverges from the local git checkout, and adds handlers in ChatView to reconcile the mismatch or switch checkout.
  • Fixes resolveThreadPr to accept a structured { threadBranch, gitStatus, hasDedicatedWorktree } object, returning the PR for dedicated worktree threads regardless of stale/missing branch metadata.
  • Replaces the horizontally-scrolling project chip UI in SidebarV2 with 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.
  • Extracts t3 service CLI subcommands (install, update, uninstall, status) from connect.ts into a dedicated service.ts module and exposes them in the CLI.
  • Adds ensurePinnedRuntimeInstalled to serialize concurrent pinned runtime installs with a sentinel-based validity check and a 10-minute npm timeout.
  • Behavioral Change: networkStatus on mobile no longer classifies devices as offline when isInternetReachable is false but isConnected is true.

Macroscope summarized 448328f.

t3dotgg and others added 6 commits July 22, 2026 23:33
…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
@macroscopeapp

macroscopeapp Bot commented Jul 23, 2026

Copy link
Copy Markdown

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:

File Size Estimate
apps/web/src/components/SidebarV2.tsx 57.89KB $2.89
apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx 25.97KB $1.30
apps/server/src/cloud/selfUpdate.ts 17.34KB $0.87

Tip

To get this pull request reviewed, you can:

  1. Comment @macroscope-app on this PR to request a manual review (monthly spend limits still apply).
  2. Exclude the file(s) above from review by adding a pattern to your .macroscope/ignore.md — note that creating this file replaces Macroscope's built-in default ignores rather than extending them.
  3. Raise your cost limit in your workspace billing settings.

Turn off this reminder going forward

@jetblk
jetblk merged commit 96dedf7 into main Jul 23, 2026
2 checks passed
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>
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.

5 participants