Skip to content

chore(sync): merge upstream/main into fork - #484

Merged
adampeterhiggins merged 67 commits into
mainfrom
t3code/sync-upstream-2026-10-24-bb7783e295
Oct 24, 2026
Merged

adampeterhiggins merged 67 commits into
mainfrom
t3code/sync-upstream-2026-10-24-bb7783e295

Conversation

@adampeterhiggins

Copy link
Copy Markdown
Owner

What's in this sync

New features

Fixes

Provider and internal changes

Remaining commits

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

Merge scope

Base: main at 4e8baf6d667105b288944c286a58b8a53c731a91.
Pinned upstream: bb7783e295506ad423f527ed28a019836e331e8c.
Upstream range: 4e8baf6d667105b288944c286a58b8a53c731a91..bb7783e295506ad423f527ed28a019836e331e8c (66 commits).
The fork was 529 commits ahead and 66 behind. No open upstream-sync PRs existed at selection or at the pre-push refresh, so there is no parent PR. This is a history-preserving --no-ff merge.

Conflict resolutions

  • Web/desktop: kept chat tabs, saved sidebar searches, tab-group search, rich context/citation rendering, minimap controls, usage-limit recovery, and PR facet counts/pills/Only while adopting indexed search and host-backed filter pickers. Adapted Start From filter scope and draft saving to the upstream image-preparation store. No upstream web file split required porting moved fork blocks.
  • Mobile: kept thread groups/pages, tab redirects, palette actions, reference links, PR facet counts, compact notices and theme-aware HTML pictures while adopting native navigation/header changes, indexed search/message jumps, chip rendering and host filter pickers. Removed duplicate draft controls now supplied by ThreadComposer.
  • Search/shared settings: retained bare-@ recent suggestions (20) and project/branch descriptions; retained settings drift checks and capability filtering. Preserved saved group and tab-group name matching in the new scorer with a failing-before/passing-after regression test.
  • Server/providers: kept fork workspace-change detach notices with upstream interrupt attribution, and kept shared-browser timeout tests beside new recording-rate tests. Devin and Muse both remain in usage schemas, drivers and clients. Deleted ACP/Grok helper modules had no production importers; active adapters retain fork telemetry and subagent support. Fork orchestration guidance tests remain.
  • Docs: usage guide lists both Devin and Muse. Reviewed docs/fork-differences.md against the fork-only commit log and merged code; existing fork behaviors remain, so its descriptions need no change.

Rewritten/deleted-file fork checklist

  • ThreadSearch.ts: 1cf0291525 saved group-name search survives as a scoped supplemental query beside indexed message hits; MCP result schema retains group_name.
  • Deleted unused mobile threadActivityInspector.ts: verified fork behavior from 579a208e7d (web fetch/search details), 577e9e887c (account switch names), 3d2d038bd9 (model parameters), and 444a6f6d77 (model changes) remains in active threadActivity.ts / thread-work-log.tsx paths.
  • Deleted ACP coreRuntimeEvents / Grok xaiBackgroundTasks helpers: only their own tests imported them; active adapters retain the fork behavior.

Verification

  • vp i completed for the changed lockfile.
  • Repository-local node_modules/.bin/vp used: the globally installed version is incompatible with this checkout's Vite+ 1.3.0.
  • Typechecks: contracts, shared, client-runtime, server, web, mobile, and desktop passed.
  • Focused tests: 173 server tests plus 3 Muse/Devin usage tests; 529 web logic tests; 162 mobile tests; 88 shared/client-runtime tests passed. Final mobile list rerun: 69 passed.
  • Targeted vp check --fix on resolved files passed with no errors; existing lint/Effect suggestions remain. git diff --check and staged whitespace checks passed.
  • Independent review of shared search, settings and provider usage found no further actionable regressions after the group-name fix.
  • check:changed was not run because it launches browser tests; this run explicitly forbids browser/computer automation. Focused non-browser checks above were run instead. No repo-wide checks, app runtime, browser automation, merge, or release was performed. UI screenshots are omitted under that restriction.

Merge with Create a merge commit. It keeps upstream history and the merge base for the next sync.

Model: GPT-6.1-Sol (medium reasoning). Harness: Codex in T3 Code.

t3dotgg and others added 30 commits October 23, 2026 03:08
…g#24063)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t started them (pingdotgg#21299)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Theo Browne <me@theo.li>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…matches (pingdotgg#24032)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#24008)

Co-authored-by: fixfon <12512757+fixfon@users.noreply.github.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…uring agent screenshots (pingdotgg#24056)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#23873)

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

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

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…23819)

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Yordis Prieto <yordis.prieto@gmail.com>
…24229)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Yordis Prieto <yordis.prieto@gmail.com>
yordis and others added 27 commits October 23, 2026 17:56
… other services (pingdotgg#23975)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…n the timeline (pingdotgg#24299)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Labeled same-repo PRs deploy stage pr-<n> behind the relay-preview environment reviewer gate. Unlabel or close tears the stage down, and a nightly job retries failed teardowns. Runtime-created managed endpoint tunnels and CNAMEs are swept by a PreviewTunnelSweep resource.

Known gaps, tracked as follow-ups: an interrupted preview deploy can leave runtime tunnels behind; repo-level relay secrets still bypass the environment gate until moved.

🤖 Generated with [Claude Code](https://claude.com/claude-code)
…ver (pingdotgg#23814)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…he version mismatch instead of reconnecting forever (pingdotgg#23647)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Theo Browne <me@theo.li>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…24206)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	apps/mobile/src/App.tsx
#	apps/mobile/src/features/home/HomeScreen.tsx
#	apps/mobile/src/features/keyboard/CommandPalette.tsx
#	apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx
#	apps/mobile/src/features/pull-requests/PullRequestListFilters.tsx
#	apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx
#	apps/mobile/src/features/pull-requests/pullRequestList.ts
#	apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
#	apps/mobile/src/features/threads/ThreadDetailScreen.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/features/threads/threadListV2.ts
#	apps/mobile/src/features/threads/use-composer-command-menu.ts
#	apps/mobile/src/features/usage/UsageRouteScreen.tsx
#	apps/mobile/src/features/workspace/WorkspaceNativeTabs.ios.tsx
#	apps/mobile/src/features/workspace/WorkspaceToolbar.ios.tsx
#	apps/mobile/src/lib/composerChipPresentation.test.ts
#	apps/mobile/src/lib/markdownDocument.ts
#	apps/mobile/src/lib/projectIcon.ts
#	apps/mobile/src/lib/threadActivityInspector.ts
#	apps/server/src/mcp/toolkits/orchestrator/tools.test.ts
#	apps/server/src/orchestration-v2/Orchestrator.ts
#	apps/server/src/orchestration-v2/ThreadSearch.test.ts
#	apps/server/src/orchestration-v2/ThreadSearch.ts
#	apps/server/src/preview/ServerBrowser.test.ts
#	apps/server/src/provider/builtInDrivers.ts
#	apps/web/src/components/ChatView.tsx
#	apps/web/src/components/CommandPaletteThreadItems.tsx
#	apps/web/src/components/ComposerPromptEditorTiptap.tsx
#	apps/web/src/components/Sidebar.logic.test.ts
#	apps/web/src/components/Sidebar.logic.ts
#	apps/web/src/components/Sidebar.tsx
#	apps/web/src/components/ThreadSearchMatch.tsx
#	apps/web/src/components/chat/ChatComposer.tsx
#	apps/web/src/components/chat/MessagesTimeline.tsx
#	apps/web/src/components/chat/UsageLimitRecoveryBanner.tsx
#	apps/web/src/components/desktopUpdate.logic.test.ts
#	apps/web/src/components/pullRequest/PullRequestListFilters.tsx
#	apps/web/src/components/pullRequest/PullRequestsPage.tsx
#	apps/web/src/components/settings/ProjectSettingsPanel.browser.test.tsx
#	apps/web/src/components/sidebar/SidebarThreadRow.tsx
#	apps/web/src/components/ui/menu.tsx
#	apps/web/src/composer-rich-text-doc.ts
#	docs/user/usage.md
#	packages/client-runtime/src/composerThreadItems.test.ts
#	packages/client-runtime/src/composerThreadItems.ts
#	packages/client-runtime/src/state/sharedSettings.test.ts
#	packages/client-runtime/src/state/sharedSettings.ts
#	packages/provider-acp/src/server/coreRuntimeEvents.test.ts
#	packages/provider-acp/src/server/coreRuntimeEvents.ts
#	packages/provider-grok/src/server/xaiBackgroundTasks.test.ts
#	packages/provider-grok/src/server/xaiBackgroundTasks.ts
#	packages/shared/src/model.test.ts
@adampeterhiggins
adampeterhiggins merged commit 7ecb73d into main Oct 24, 2026
@adampeterhiggins
adampeterhiggins deleted the t3code/sync-upstream-2026-10-24-bb7783e295 branch October 24, 2026 11:52
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.