Skip to content

cherry-pick: integrate 7 upstream commits with fork enhancements#12

Merged
gabrielMalonso merged 9 commits intomainfrom
gabrielMalonso/fix-sidebar-toggle-ts
Mar 12, 2026
Merged

cherry-pick: integrate 7 upstream commits with fork enhancements#12
gabrielMalonso merged 9 commits intomainfrom
gabrielMalonso/fix-sidebar-toggle-ts

Conversation

@gabrielMalonso
Copy link
Copy Markdown
Owner

What Changed

Cherry-picked 7 upstream commits from pingdotgg/t3code into the fork, integrating:

All commits integrated cleanly with one conflict resolved in ChatView.logic.ts (merged both fork's CodexReasoningEffort and upstream's ProjectId imports).

Why

Syncs the fork with important upstream fixes and improvements while preserving fork-specific customizations (Agent SDK integration, worktree branch sync, PR review button, ChatView component split).

Testing

  • TypeScript compilation: ✅ zero errors (apps/server and apps/web)
  • Unit tests: ✅ MessagesTimeline.logic.test.ts (7/7), appSettings.test.ts (5/5)
  • Integration tests: pre-existing timeouts in GitCore (unrelated to cherry-picks)

@chatgpt-codex-connector
Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, you can upgrade your account or add credits to your account and enable them for code reviews in your settings.

@github-actions github-actions bot added size:XXL 1,000+ changed lines (additions + deletions). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. labels Mar 12, 2026
@gabrielMalonso gabrielMalonso merged commit e607086 into main Mar 12, 2026
5 checks passed
@gabrielMalonso gabrielMalonso deleted the gabrielMalonso/fix-sidebar-toggle-ts branch March 24, 2026 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL 1,000+ changed lines (additions + deletions). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants