Skip to content

chore(fork): merge upstream v0.1.9-nightly.20261111.4515 - #39

Merged
tebiggs merged 137 commits into
mainfrom
sync-conflict/v0.1.9-nightly.20261111.4515
Nov 11, 2026
Merged

tebiggs merged 137 commits into
mainfrom
sync-conflict/v0.1.9-nightly.20261111.4515

Conversation

@tebiggs

@tebiggs tebiggs commented Nov 11, 2026 •

Copy link
Copy Markdown
Owner

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

Merges upstream v0.1.9-nightly.20261111.4515 into the fork's main.

Conflicted files:

  • apps/server/src/provider/agentContextBudget.json: both sides changed the measured byte counts. Upstream grew the Claude system append and the Codex additional context by 50 bytes each and left the MCP tool list unchanged; the fork's tool list is 32 bytes larger than upstream's. The resolution takes upstream's Claude and Codex values (5597, 7327) and keeps the fork's MCP tool list value (48249). AgentContextBudget.test.ts in CI checks these against the measured text.

Follow-up fix:

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 10, 2026 01:39
… the sheet (pingdotgg#33223)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Nathan Wong <20381195+thelogicmatrix@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… instead of running forever (pingdotgg#33008)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…me it in the sign-in hint (pingdotgg#32951)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ot its whole history (pingdotgg#33305)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…status refresh (pingdotgg#32905)

Co-authored-by: ferhtgoldaraz <2060086+ferhtgoldaraz@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…of asking to reconnect (pingdotgg#32994)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…hots for good (pingdotgg#32861)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…28353)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…bar's place (pingdotgg#33021)

Co-authored-by: dongxingong <8446245+dongxingong@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#27791)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
…er (pingdotgg#32936)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#32576)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tered on (pingdotgg#32425)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ar hasn't loaded (pingdotgg#32507)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 29 commits November 10, 2026 22:45
…uages again (pingdotgg#33680)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#22836)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#28732)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…un claude update (pingdotgg#34176)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tab opens again (pingdotgg#34168)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…only the 2-minute sweep (pingdotgg#33548)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#30620)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ity trees (pingdotgg#33745)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ing a turn (pingdotgg#33900)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…ents (pingdotgg#22553)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… base's PR (pingdotgg#22861)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#22996)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…he binding changes (pingdotgg#32494)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-Authored-By: Claude <noreply@anthropic.com>
The fork's read-only guard (#19) answers serverRefreshProviders without a
refresh for sessions lacking the operate scope, as the neighbouring
on-demand test already accounts for.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@tebiggs
tebiggs merged commit 4ec168f into main Nov 11, 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.