Skip to content

chore: merge upstream/main into fork (2026-11-14) - #578

Open
adampeterhiggins wants to merge 251 commits into
mainfrom
t3code/sync-upstream-2026-11-14-0931
Open

adampeterhiggins wants to merge 251 commits into
mainfrom
t3code/sync-upstream-2026-11-14-0931

Conversation

@adampeterhiggins

Copy link
Copy Markdown
Owner

What's in this sync

Adds 250 upstream commits beyond the parent sync.

Discord announcements were not used: the channel returned only older non-crosspost messages, with no announcement matching this range.

Stack and scope

Parent: #577. This PR adds only newer upstream commits relative to that parent. Merge the parent first.

Base: 29270c6bb3e8e199a66129d8e5efbb2b6a79d8fd.
Pinned upstream: 4574c6013d52867878038967297a885f1692383c.
Range: 29270c6bb3e8e199a66129d8e5efbb2b6a79d8fd..4574c6013d52867878038967297a885f1692383c.

Conflict resolutions

  • Web: retained fork composer context/account actions, sidebar tabs, detached/quick-message surfaces, elapsed timers, shared themes and terminal ANSI roles; integrated upstream WSL drops, model selection, compaction history, timing, image galleries and custom CSS. Theme sharing now serializes CSS.
  • Desktop/mobile: retained fork startup/appearance and quick-message setup, organisation facets, object/Google links and shared themes while adopting upstream bootstrap, path conversion, reference definitions and reply behavior.
  • Server: kept linked checkouts, subscription guards, integrations, custom editors, cleanup and browser deadlines while integrating native resume, provider query policies and diagnostics. Both sides' independent tests retained; setup tests adapted to the fork shell wrapper.
  • Cursor: retained Keychain/file credentials and timeout diagnostics beside upstream cached API/team membership discovery; combined context-fill reporting with validated cumulative billing and subscription limits, converting streamed cache counts to avoid double counting.
  • Contracts/shared: unioned theme sync, default appearance, access scopes, model-call usage, desktop bridge methods and shared exports. Theme publish/unpublish share the upstream apply semaphore and CSS validation.
  • Reviewed upstream refactors for split-file feature loss; none of the conflicted files required porting fork features into a new split file. Reconciled the fork differences guide for upstream Cursor context/usage support.

Verification

  • Dependency install completed (vp install, bootstrapped through npm exec because vp was initially absent).
  • Contracts, provider-core, provider-cursor, web, mobile, desktop and server typechecks pass.
  • Root-focused tests: 114 passed; final theme tests: 12 passed including shared CSS refusal.
  • Web-focused tests: 397 passed. Desktop/mobile/Cursor-focused tests: 175 passed.
  • Server: broad adapter/orchestration batch had 839 passing cases; final setup/restart 38 passed, preview mocks 8 passed, capability probe 4 passed with one platform skip.
  • Resolved-file formatting/lint and git diff --check pass.
  • check:changed: format, lint, both knip passes, both generated GraphQL checks, unused patches and all 41 package typechecks passed. Its aggregate test step was stopped because it initializes headless browser fixtures even when browser files/projects are excluded. The focused tests above passed; the aggregate test gate is incomplete under this run's browser-automation restriction. No interactive browser/computer 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.

juliusmarminge and others added 30 commits November 13, 2026 08:43
… forward (pingdotgg#30173)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…model (pingdotgg#34149)

Co-authored-by: Ali Alwan <Ali-Al1@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…lank cell (pingdotgg#35341)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…tgg#36211)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
WesleySmits and others added 29 commits November 14, 2026 00:33
pingdotgg#24042)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…parent menu (pingdotgg#23666)

Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#36574)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#24062)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#36578)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#23715)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e as their label (pingdotgg#35614)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Aatman Jain <lives@MacBook-Pro.local>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…36588)

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

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

Co-authored-by: jason chien <3936511+jason5545@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#24045)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#25472)

Co-authored-by: Abid A Gafoor <40262245+sgaabdu4@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…indows (pingdotgg#24006)

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

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#36602)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
# Conflicts:
#	apps/desktop/src/app/DesktopApp.ts
#	apps/desktop/src/ipc/methods/window.test.ts
#	apps/desktop/src/preload.ts
#	apps/mobile/src/features/home/HomeRouteScreen.tsx
#	apps/mobile/src/features/home/HomeScreen.tsx
#	apps/mobile/src/features/threads/ThreadFeed.tsx
#	apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
#	apps/mobile/src/features/threads/thread-list-v2-items.tsx
#	apps/mobile/src/lib/markdownDocument.ts
#	apps/mobile/src/lib/threadActivity.ts
#	apps/server/src/environmentTheme.test.ts
#	apps/server/src/environmentTheme.ts
#	apps/server/src/mcp/PreviewAutomationBroker.ts
#	apps/server/src/mcp/WorktreeMcpService.ts
#	apps/server/src/mcp/toolkits/project/handlers.ts
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
#	apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts
#	apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
#	apps/server/src/orchestration-v2/Orchestrator.ts
#	apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts
#	apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
#	apps/server/src/orchestration-v2/ProviderTurnStartService.ts
#	apps/server/src/orchestration-v2/SelectionRestart.integration.test.ts
#	apps/server/src/orchestration-v2/ThreadLaunchService.ts
#	apps/server/src/orchestration-v2/ThreadManagementService.test.ts
#	apps/server/src/preview/ServerBrowserPage.test.ts
#	apps/server/src/preview/ServerBrowserPage.ts
#	apps/server/src/process/externalLauncher.ts
#	apps/server/src/project/AgentSessionScanner.ts
#	apps/server/src/project/ProjectSetupScriptRunner.test.ts
#	apps/server/src/provider/ClaudeCapabilitiesProbe.test.ts
#	apps/server/src/provider/ClaudeProvider.ts
#	apps/server/src/provider/agentContextBudget.json
#	apps/server/src/provider/claudeUsageLimits.ts
#	apps/server/src/server.ts
#	apps/server/src/storageCleanup.ts
#	apps/server/src/textGeneration/ClaudeTextGeneration.ts
#	apps/server/src/usage/UsageService.ts
#	apps/server/src/ws.ts
#	apps/web/src/components/ChatMarkdown.browser.test.tsx
#	apps/web/src/components/ChatView.logic.test.ts
#	apps/web/src/components/ChatView.logic.ts
#	apps/web/src/components/ChatView.tsx
#	apps/web/src/components/CommandPalette.tsx
#	apps/web/src/components/Sidebar.tsx
#	apps/web/src/components/chat/ChatComposer.tsx
#	apps/web/src/components/chat/ComposerBannerStack.tsx
#	apps/web/src/components/chat/ComposerPermissionsSection.browser.test.tsx
#	apps/web/src/components/chat/MarkdownFileLink.tsx
#	apps/web/src/components/chat/MessagesTimeline.logic.ts
#	apps/web/src/components/chat/TimelineWorkEntryRow.tsx
#	apps/web/src/components/chat/TimelineWorkGroupRows.logic.ts
#	apps/web/src/components/chat/TimelineWorkGroupRows.tsx
#	apps/web/src/components/chat/timelineRowContext.ts
#	apps/web/src/components/chat/useComposerSelection.ts
#	apps/web/src/components/chat/useComposerSend.ts
#	apps/web/src/components/sidebar/SidebarThreadRow.tsx
#	apps/web/src/composer-rich-text.ts
#	apps/web/src/composerDraftStore.ts
#	apps/web/src/hooks/useEnvironmentTheme.ts
#	apps/web/src/terminal/ghostty/core.test.ts
#	apps/web/src/themePalette.ts
#	docs/user/appearance.md
#	packages/contracts/src/ipc.ts
#	packages/contracts/src/orchestrationV2.ts
#	packages/contracts/src/settings.test.ts
#	packages/contracts/src/settings.ts
#	packages/provider-core/src/server/managedProvider.test.ts
#	packages/provider-cursor/src/server/CursorAccountReader.ts
#	packages/provider-cursor/src/server/accountUsage.test.ts
#	packages/provider-cursor/src/server/accountUsage.ts
#	packages/provider-cursor/src/server/adapter.ts
#	packages/provider-cursor/src/server/sdkModel.ts
#	packages/shared/package.json
Base automatically changed from t3code/sync-upstream-2026-11-13-1506 to main November 14, 2026 11:09

This branch has not been deployed

No deployments
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.