Repository navigation
chore(sync): merge upstream/main into fork - #296
Merged
Merged
Conversation
…g#18608) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…page (pingdotgg#18666) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#16554) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
… you to a new draft (pingdotgg#18672) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ct (pingdotgg#18824) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…stead of crash-looping (pingdotgg#15925) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: PR Batch Tester <agent@local.test>
… resync after a downgrade (pingdotgg#15937) Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com> Co-authored-by: PR Batch Tester <agent@local.test>
… MCP servers (pingdotgg#17058) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…ught (pingdotgg#18887) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ingdotgg#18878) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…is offline (pingdotgg#18698) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…18853) Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
…gdotgg#18709) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#18900) Co-authored-by: Pawel Mikolajczuk <pmikolajczuk@atlassian.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
adampeterhiggins
force-pushed
the
t3code/sync-upstream-2026-10-13
branch
from
October 13, 2026 14:17
d1e683a to
07175cb
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
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.
Sync the fork with all 28 upstream commits through
6524a8d437. At the start of the sync, the fork was 330 commits ahead and 28 behind upstream. This branch is based on forkmainthrough532533043e, retaining its filter menus, linked-repository PR references, model-parameter change markers, persistent sidebar searches, and lockfile-aware update builds.Resolved the overlapping changes while keeping fork behavior:
Audited the automatically merged intersections and
docs/fork-differences.md; none of the documented differences was adopted or removed by these upstream commits. Devin, Custom ACP, Cursor defaults/steering, integration context, chat tabs, agent panels, update pausing, and other fork additions remain in the merged tree.Validation:
--lib ES2024,DOM,DOM.Iterable. Its standard check has a pre-existing ES2023-library error onPromise.withResolversinterminal/ghostty/surface.test.ts.mcp/AgentAccessMcpServer.ts; these are disclosed rather than counted as a clean check.git diff --checkpasses. No browser or native-device verification was performed.Merge with Create a merge commit. It keeps upstream history and the merge base for the next sync.
Model: GPT-6.1-sol. Harness: Codex in T3 Code.