Skip to content

chore(fork): merge upstream v0.1.12-nightly.20261122.5085 - #65

Merged
tebiggs merged 125 commits into
mainfrom
sync-conflict/v0.1.12-nightly.20261122.5085
Nov 22, 2026
Merged

tebiggs merged 125 commits into
mainfrom
sync-conflict/v0.1.12-nightly.20261122.5085

Conversation

@tebiggs

@tebiggs tebiggs commented Nov 22, 2026

Copy link
Copy Markdown
Owner

Merge this with Create a merge commit, not squash, so upstream history stays intact.

Merges upstream v0.1.12-nightly.20261122.5085 into the fork.

Conflicted files:

  • apps/server/src/provider/agentContextBudget.json: both sides raised mcpToolListJsonBytes from 59026 (fork to 59058, upstream to 59052). Set it to 59084, the value AgentContextBudget.test.ts measures on the merged tree. No FORK.md feature changes behavior.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 21, 2026 00:37
…CODE_TANSTACK_SOURCE (pingdotgg#40207)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit b32f90b)
…rt grow-in

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit 4ce558b)
Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit cbc50d8)
Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#40282)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ng (pingdotgg#40316)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
juliusmarminge and others added 29 commits November 21, 2026 15:13
…otgg#40594)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… is gone (pingdotgg#40627)

Co-authored-by: Kevin Flores <101906409+kevincommits@users.noreply.github.com>
… drag (pingdotgg#33221)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…itle limit (pingdotgg#29830)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ests (pingdotgg#40634)

Co-authored-by: Mostafa El Ayoubi <20224923+MostafaElAyoubi@users.noreply.github.com>
pingdotgg#40633)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#40622)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…heckout (pingdotgg#38271)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#38542)

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e per turn (pingdotgg#40671)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
… drops its prompt (pingdotgg#40670)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ared tooltip; remark leaves the web app (pingdotgg#27866)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Gemini 4 Neon <noreply@google.com>
Co-authored-by: Noah Sigel <noah.sigel@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…-foreground-muted (pingdotgg#40676)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#40701)

Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…not generate text (pingdotgg#40699)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s the draft (pingdotgg#40708)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-Authored-By: Claude <noreply@anthropic.com>
@tebiggs
tebiggs merged commit a7506fb into main Nov 22, 2026
12 checks passed
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.