Skip to content

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

Open
adampeterhiggins wants to merge 179 commits into
mainfrom
t3code/sync-upstream-2026-11-11-1245
Open

adampeterhiggins wants to merge 179 commits into
mainfrom
t3code/sync-upstream-2026-11-11-1245

Conversation

@adampeterhiggins

@adampeterhiggins adampeterhiggins commented Nov 11, 2026 •

Copy link
Copy Markdown
Owner

What's in this sync

Regression testing: 7,863 tests passed across 292 non-browser test files, with 12 existing conditional skips. Browser/runtime and model-eval limits remain; see Verification below.

New features

Fixes

Provider and internal changes

  • Claude fixes include early CLI exits, native-session history imports, subagent effort and token accounting. OpenCode recovers compacted context overflows; Pi, Codex, Cursor and Antigravity receive protocol or quota fixes.
  • Long-thread reads, MCP calls, PR status checks, usage-cache writes and new-worktree index refreshes do less repeated work.
  • Includes upstream v0.1.9 preparation; this PR does not publish a fork release.

Discord announcements were not used: the configured channel returned only older ordinary messages and no matching announcement crossposts.

Full upstream commit list (including remaining fixes, tests, and maintenance)

Merge details

Base: origin/main at 64cca8f34f9b88d79ab298495d2232c55aa196a0. No parent PR.
Started from 87fcf653854d692fb12758eff7cdd0f7b35a8a0f; a clean catch-up merge includes the new usage-footer filtering change on main.
Pinned upstream: a74ee4cc7c0ee9729f58dfff6cc2a118692cf8ea.
Upstream range: 64cca8f34f9b88d79ab298495d2232c55aa196a0..a74ee4cc7c0ee9729f58dfff6cc2a118692cf8ea (176 upstream commits; the fork has 646 commits outside that upstream history).

Conflict resolutions

  • Server: preserved fork MCP orchestration, scoped authorization and rollback controls, subscription-limit behavior, native-session picker/import identity, integration schemas, custom launch commands, browser request budgets, and provider pricing/CLIProxy extensions. Adopted upstream native ACP history, query ownership and notification/image protocols.
  • Web: retained provider-account selection, model forking, rich citation comments/destinations, integrations, detached chat, timeline previews and workspace markers, sidebar/palette actions, automations, and custom Open in behavior. Adopted upstream compaction steering, disclosure readiness, accessibility and static icons.
  • Shared/mobile/desktop: combined contracts and package exports, preserved citation formatting and long IDs, carried the scheduler timezone into the fork's shared presentation helper, and combined desktop sender authorization with quick-message event routing.
  • Fixed merge-clean integration mismatches in tests and imports, and repaired an inconsistent Vite+ peer entry in the merged lockfile.
  • Reconciled docs/fork-differences.md: upstream now also imports native ACP history; the fork retains its conversation picker and single-session import behavior.

Moved-code audit

Verification

  • Regression batches: 7,863 tests passed, 12 existing platform/optional-tool skips, zero unresolved failures across 292 non-browser files (server 3,669; web 1,423; desktop/mobile 508; packages/evals/scripts 2,263).
  • Tests found a Claude dead-query regression: the failed turn was finalized but startTurn returned success. The existing regression failed before the fix; returning the protocol error preserves finalization and all 387 Claude adapter tests now pass.
  • Corrected a telemetry IPC test fixture to supply sender data required by upstream validation; retained every policy/opt-out assertion.
  • The original combined 377-file check timed out without output. Smaller batches identified scanner fixtures placed under a managed worktree and an overlong Unix-socket path as test-environment problems. Using the system temporary directory let the affected non-browser batches finish; no scanner/socket code or test waits/skips were changed.
  • All 41 affected package typechecks, formatting, lint, both knip checks, GraphQL generation, patch validation and React Compiler coverage passed on the sync. Follow-up vp run check:changed be720e8b2a passed: format, lint, both knip checks, server GraphQL generation, all four affected package typechecks, and the three selected test files.
  • Targeted source review also caught and fixed Quick Message IPC authorization. The existing production-guard test failed before the fix, then passed while still rejecting guests/subframes and retaining per-method guards.
  • Coverage limits: 85 browser-dependent files excluded under the requested restriction against browser/computer automation. No native/UI runtime pass performed. Required Playwright Chromium is absent. File-link model eval attempted but could not start because vibeproxy is absent from ~/.codex/config.toml; no paid eval result claimed.

No PR was merged and no release was published.

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 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>
shawk08033 and others added 30 commits November 11, 2026 02:30
…dotgg#23111)

Co-authored-by: Shaun Hawk <shawk@fsmeneregy.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#18187)

Co-authored-by: Roger Vilaseca <roger@tres65.es>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#22155)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Alan Justino da Silva <155623+alanjds@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…hread title (pingdotgg#25743)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ng the desktop's T3 home (pingdotgg#21661)

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

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

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>
…gdotgg#21530)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gs default (pingdotgg#16546)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: macodev00 <macodev00@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ils the turn (pingdotgg#26743)

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

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

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

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

Co-authored-by: macodev00 <macodev00@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#21968)

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

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

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>
… answers (pingdotgg#26992)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…host returns without this update's outcome (pingdotgg#27275)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	apps/desktop/src/app/DesktopApp.test.ts
#	apps/desktop/src/ipc/DesktopIpc.ts
#	apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx
#	apps/mobile/src/state/use-thread-composer-state.ts
#	apps/server/src/mcp/OrchestratorMcpService.ts
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
#	apps/server/src/orchestration-v2/ThreadLaunchService.ts
#	apps/server/src/orchestration-v2/testkit/fixtures/kiro_model_switch/kiro_transcript.ndjson
#	apps/server/src/orchestration-v2/testkit/fixtures/kiro_unknown_model/kiro_transcript.ndjson
#	apps/server/src/persistence/Sqlite.ts
#	apps/server/src/preview/ServerBrowserPage.ts
#	apps/server/src/process/externalLauncher.ts
#	apps/server/src/project/AgentSessionImporter.test.ts
#	apps/server/src/project/AgentSessionImporter.ts
#	apps/server/src/project/AgentSessionScanner.ts
#	apps/server/src/provider/ClaudeProvider.ts
#	apps/server/src/provider/agentContextBudget.json
#	apps/server/src/usage/cliproxyApi.test.ts
#	apps/server/src/usage/cliproxyApi.ts
#	apps/server/src/usage/usageAggregation.ts
#	apps/server/src/usage/usagePricing.ts
#	apps/web/src/components/ChatMarkdown.tsx
#	apps/web/src/components/ChatView.tsx
#	apps/web/src/components/CommandPalette.tsx
#	apps/web/src/components/ComposerPromptEditorTiptap.citationDraft.browser.test.tsx
#	apps/web/src/components/ComposerPromptEditorTiptap.tsx
#	apps/web/src/components/RightPanelTabs.browser.test.tsx
#	apps/web/src/components/ServerUpdateAction.tsx
#	apps/web/src/components/Sidebar.logic.ts
#	apps/web/src/components/Sidebar.tsx
#	apps/web/src/components/ThreadNotificationCoordinator.tsx
#	apps/web/src/components/ThreadRouteView.tsx
#	apps/web/src/components/chat/AssistantCitationChip.tsx
#	apps/web/src/components/chat/ChatComposer.tsx
#	apps/web/src/components/chat/ComposerAttachmentStrip.tsx
#	apps/web/src/components/chat/ComposerPrimaryActions.tsx
#	apps/web/src/components/chat/MarkdownFileLink.tsx
#	apps/web/src/components/chat/MessagesTimeline.browser.test.tsx
#	apps/web/src/components/chat/MessagesTimeline.logic.ts
#	apps/web/src/components/chat/MessagesTimeline.tsx
#	apps/web/src/components/chat/ShellCommandBlock.tsx
#	apps/web/src/components/chat/TimelineWorkEntryRow.tsx
#	apps/web/src/components/chat/TimelineWorkGroupRows.tsx
#	apps/web/src/components/chat/V2ItemInspector.tsx
#	apps/web/src/components/chat/timelineMinimapItems.ts
#	apps/web/src/components/chat/timelineScrollAnchoring.test.tsx
#	apps/web/src/components/chat/useRightPanelActions.ts
#	apps/web/src/components/composerContextPresentation.tsx
#	apps/web/src/components/files/FilePreviewPanel.tsx
#	apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
#	apps/web/src/components/pullRequest/PullRequestLinkPreview.tsx
#	apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
#	apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx
#	apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
#	apps/web/src/components/settings/ScheduledTasksSettings.tsx
#	apps/web/src/components/settings/SettingsPanels.tsx
#	apps/web/src/components/settings/StorageSettings.tsx
#	apps/web/src/components/settings/scheduledTasksSettings.logic.test.ts
#	apps/web/src/components/sidebar/SidebarThreadRow.tsx
#	apps/web/src/lib/openPullRequestLink.ts
#	apps/web/src/rightPanelStore.ts
#	docs/user/usage.md
#	knip.jsonc
#	packages/client-runtime/package.json
#	packages/client-runtime/src/work-log/embeddedScripts.test.ts
#	packages/contracts/src/assistantCitations.ts
#	packages/contracts/src/keybindings.ts
#	packages/provider-core/src/server/runtimeInstructions.ts
#	packages/provider-grok/src/server.ts
#	packages/provider-grok/src/server/usageLimits.ts
#	packages/provider-opencode/src/server/driver.ts
#	packages/shared/package.json
#	packages/shared/src/assistantCitations.ts
#	packages/shared/src/keybindings.ts
#	packages/shared/src/markdownPipeline.ts
#	packages/source-control-github/src/server/pullRequestReviews.graphql.ts

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.