Skip to content

chore: sync with upstream (2026-11-02) - #91

Merged
riccardovandra merged 352 commits into
mainfrom
sync/upstream-2026-11-02
Nov 2, 2026
Merged

riccardovandra merged 352 commits into
mainfrom
sync/upstream-2026-11-02

Conversation

@riccardovandra

Copy link
Copy Markdown
Owner

What's new from upstream

New features

Bug fixes

Providers

Server

Web

Desktop

Mobile

Other notable changes

Merge report

Commits merged: 351 upstream commits (350 PRs plus the v0.1.6 release commit), through c65f8d552b. Merged as a merge commit. Please land this PR as a merge commit too, not a squash.

Conflicts resolved (11 files):

  • apps/desktop/src/main.ts, updates/DesktopUpdates.ts, updates/updatesTestHarness.ts: kept the fork's MacSelfInstall alongside upstream's new DesktopUpdatePolicy and DesktopManagedPolicy. Both layers are provided.
  • apps/mobile/src/features/threads/ThreadRouteScreen.tsx, packages/contracts/src/index.ts, packages/provider-acp/src/server/adapter.ts: kept both sides' imports and exports.
  • packages/contracts/src/settings.ts: kept the fork's mcpServers and disabledSkills plus upstream's usageModelFilter.
  • packages/provider-opencode/src/server/adapter.test.ts: kept both sides' tests.
  • apps/web/src/components/chat/ChatComposer.tsx: kept the fork's disabled-skills filter and took upstream's { refresh, scanning } return shape.
  • apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts: combined upstream's new threadId param and t3-code-direct server with the fork's user MCP servers and threadRuntimeParams wrapper. All four call sites pass threadId.
  • apps/server/src/provider/agentContextBudget.json: set to the measured values on the merged tree (claudeSystemAppendBytes 6785, codexAdditionalContextBytes 8511, mcpToolListJsonBytes 49914).

Judgment calls and clean auto-merges that needed fixing:

  • apps/server/src/serverSettings.ts: upstream's managed policy made updateAndPersistSettings take the patch so it can vet writes. The fork's updateSettingsWith builds its patch inside the write lock, so the helper now accepts a patch or a builder. Fork writes go through the same policy check.
  • t3-code-direct is now a reserved MCP server name in both packages/contracts/src/mcpServers.ts and agentTools.ts. Without this, a user server with that name could replace the Codex direct-call registration.
  • CodexAdapterV2.test.ts: fork tests updated for the required threadId and the extra t3-code-direct server.
  • packages/contracts/src/agentTools.ts: shortened one fork comment that failed the no-low-value-comments pre-commit lint.

Verification:

  • node scripts/fork-brand.ts --check: passes (197 files).
  • Typecheck: passes on apps/server, apps/web, apps/desktop, apps/mobile, packages/contracts, packages/shared, packages/client-runtime, packages/provider-acp, packages/provider-opencode.
  • Fork test files and tests beside conflicted files: all pass in web, desktop, mobile, client-runtime, shared, contracts, every provider package, and scripts/. apps/server has failures, listed here:
Failure origin/main Pristine upstream/main Status
ServerEnvironment.test.ts "publishes proven install ownership" not run fails Known upstream macOS failure
OpenCode2OrchestratorV2.integration.test.ts (5 tests) fails passes Already broken on the fork before this merge. The replay fixture expects a session.update where the adapter sends event.subscribe. Not fixed here
McpUpstreamRoute.test.ts "reports a rejected credential without answering 401" passes 12 of 12 runs not run Intermittent on this branch: failed 3 of 24 runs with status 200 instead of 503. Root cause not found. Its failure did not reproduce in the 12 instrumented runs

The last row needs a follow-up. It may be a test race, but I could not rule out a real problem, so treat the rejected-credential path as unverified until it is understood.

Worked by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

camchis and others added 30 commits November 1, 2026 02:36
…27249)

Co-authored-by: nibarAhmed <nibarahmed0@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…00ms" (pingdotgg#27266)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…gdotgg#27274)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…m PATH (pingdotgg#27321)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…he server attached (pingdotgg#27456)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…rly 404 (pingdotgg#27722)

Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…branch named t3 exists (pingdotgg#27815)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Omar <76748259+omar9848492@users.noreply.github.com>
EtanHey and others added 29 commits November 1, 2026 22:07
…nched the app (pingdotgg#28464)

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

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…med models (pingdotgg#29001)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e Mode (pingdotgg#29026)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…is slow on a loaded host (pingdotgg#28201)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… reseller marks them up (pingdotgg#28004)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@riccardovandra
riccardovandra merged commit bbf6b7c into main Nov 2, 2026
1 check failed
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.