Repository navigation
chore(sync): merge pingdotgg/t3code main - #276
Merged
Merged
Conversation
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…s junctions point to (pingdotgg#21099) Co-authored-by: sheehanmunim <80079528+sheehanmunim@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#22730) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#22686) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Upstream pingdotgg#22730 swapped the sidebar import of useThreadShells for useQuietThreadShells. The fork owner filter only counts threads, so it reads the quiet list too. Adds a browser test for the request headers of the add environment dialog, which upstream pingdotgg#22686 moved.
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
3 participants
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.
Fork Sync run 39658358093 failed: the merge of 4 upstream commits conflicted in two web files.
Conflicts
apps/web/src/components/settings/ConnectionsSettings.tsx: upstream refactor(web): the add environment dialog owns its form state pingdotgg/t3code#22686 moved the add environment form into the newAddEnvironmentDialog.tsx. The fork request headers for that form (save the headers before the pairing, restore them when the pairing fails, show the Cloudflare Access message, the "Request headers" fields) now live inAddEnvironmentDialog.tsx.ConnectionsSettings.tsxtakes the upstream version and keeps theForkConnectionsimport for the tunnel pairing row and the sibling sign-in rows.apps/web/src/components/sidebar/SidebarThreadRow.tsx: imports only. Kept the fork imports and added the upstreamuseThreadShellimport.Upstream changes in fork areas
useThreadShellsimport inSidebar.tsxwithuseQuietThreadShells. The fork owner filter still calleduseThreadShells, so the typecheck failed. The owner filter only counts threads, so it now reads the quiet list too. This keeps the upstream fix: a streaming thread re-renders only its own row. Every v2 sidebar row goes throughSortableThreadRow, which reads the live shell, so the fork card layout still gets live data.removeLinkedWorktree. It has no path root check, so fork template worktrees (isT3CreatedWorktree) still get removed.AGENTS.md. No fork effect.Tests
AddEnvironmentDialog.browser.test.tsx: the dialog saves the request headers before the pairing and restores the previous headers when the pairing fails.Checks
vp run typecheck: all packages pass after the owner filter fix.