merge upstream/main into fork - #83
Merged
Merged
Conversation
…4304) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…14311) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…dotgg#12900) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…2449) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: SAPHID <saphid@users.noreply.github.com>
…otgg#8865) Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com> Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
# Conflicts: # apps/web/src/components/chat/ComposerCommandMenu.tsx
adampeterhiggins
force-pushed
the
t3code/sync-upstream-2026-09-30
branch
from
September 30, 2026 11:37
37fc678 to
15ffbbe
Compare
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
10 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.
Brings the fork up to date with
pingdotgg/t3code. Before this merge the fork was 16 commits behind upstream and 124 ahead. Upstream's additions include releases v0.0.43 and v0.0.44, Codex 0.159 protocol bindings, Grok crashed-session recovery, multi-PR badges that open the linked pull requests panel, and several web fixes.Conflict resolutions
#menu (apps/web/src/components/chat/ComposerCommandMenu.tsx): upstream fix(web): let command menu descriptions use the full row width pingdotgg/t3code#8865 dropped themax-w-[48ch]cap on command descriptions, and the fork wraps that row in its Linear issue branch. I kept the fork'sLinearIssueRowbranch and applied upstream's full-width description to the default row.All other files merged cleanly.
Verification
vp i(the merge bumps package versions to 0.0.44)@t3tools/web,t3(server),@t3tools/shared,@t3tools/client-runtime,@t3tools/mobile, with no errorsvp test runforComposerCommandMenu.test.tsx,rightPanelStore.test.ts,usageLimits.test.ts, andwork-log/userInput.test.ts: all passvp check --fixon the resolved file, thengit diff --checkMerge with Create a merge commit. It keeps upstream history and the merge base for the next sync.
Done by Claude Opus 5.5 in Claude Code (via T3 Code).
🤖 Generated with Claude Code