Skip to content

chore: sync upstream main (105 commits) - #68

Open
jamesainslie wants to merge 106 commits into
mainfrom
sync-upstream-2026-10-11
Open

jamesainslie wants to merge 106 commits into
mainfrom
sync-upstream-2026-10-11

Conversation

@jamesainslie

Copy link
Copy Markdown
Owner

Brings Lathe level with upstream main at f23d008 (105 upstream commits since the 2026-10-10 sync). The merge hit 19 conflicted files, almost all where both sides appended to the same list, plus four places where fork code had to follow an upstream change.

What's coming in

74 fixes, 13 features, 9 perf changes. Features:

Conflicts

  • Both sides added entries (kept both): server environment capabilities (gitHubAccountRouting and projectProviderInstanceOverrides), mobile preferences, MCP test layers, settings schema keys, test imports.
  • Project-scoped settings: the fork's gitHubAccount override sits next to upstream's new providerInstances override. Upstream's t3ProjectFile mapped type is taken, which is equivalent to the fork's.
  • Host settings: upstream replaced the Bitbucket and GitHub per-host settings structs with SourceControlHostSettings. The fork's usage-limit secret helpers stay.
  • Run execution: the fork's open-tool-item tracking stays, and upstream's tighter delivery condition for owned child threads is applied after it.
  • Server layers: upstream's ProjectStore provide goes in front of the fork's layerGitVcsDriver.
  • Pull request providers: upstream's per-host actions are mapped over the fork's deduplicated hostResults.
  • Timeline imports: upstream's WorkspaceEntryIcon and the fork's SelectionCitationToolbar.

Fork code adapted to upstream

  • SourceControlProviderKind is now branded, so GitHub account routing and its tests build kinds with SourceControlProviderKind.make.
  • ProjectService now reads ServerSettings, so the project sync test provides ServerSettings.layerTest.
  • Upstream's new review guide diffs use useDiffThemeName, so they follow the fork's syntax theme like every other diff surface.
  • Both sides added the same DateTime import to MessagesTimeline.logic.ts.

Verification

  • Typecheck passes for contracts, shared, client-runtime, provider-core, source-control-core, -github, -gitcafe and -bitbucket, ssh, scripts, server, web, desktop and mobile.
  • Format is clean and lint reports no errors (warnings only) on every touched file.
  • Identity greps show no drift. The merge adds no new upstream workflows to disable.
  • Targeted tests (21 files, 977 tests) in the conflicted and adapted areas pass. The only failure is the install ownership case in ServerEnvironment.test.ts, which is the known macOS /var symlink issue from the last sync. It passes with TMPDIR set to its real path.

Done by Claude Opus 5.5 in Claude Code, running in Lathe.

Yash-Singh1 and others added 30 commits October 10, 2026 07:51
…dotgg#17223)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…ingdotgg#17843)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…g#17724)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
… full-access MCP grants (pingdotgg#17772)

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

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Julius Marminge <jmarminge@gmail.com>
Signed-off-by: Loïs Postula <lois@postu.la>
…slug (pingdotgg#17739)

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

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

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

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

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

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ith a GitCafe token (pingdotgg#17901)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
AdEx-Partners-DE and others added 30 commits October 11, 2026 01:52
…otgg#17938)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…op's end (pingdotgg#14744)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…d reply (pingdotgg#14752)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
… partway (pingdotgg#14723)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…Windows desktop (pingdotgg#16869)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…inary (pingdotgg#16838)

Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…to 0% (pingdotgg#16394)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…tgg#17528)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…er hides every skill (pingdotgg#17389)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…yarn group across 1 directory (pingdotgg#16309)

Signed-off-by: dependabot[bot] <support@github.com>
)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…op (pingdotgg#16480)

Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#17879)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Brings in 105 upstream commits (f7664fd..f23d008). Besides the 19
conflicted files, fork code needed these adjustments to upstream changes:

- SourceControlProviderKind is now branded, so GitHub account routing and
  its tests build kinds with SourceControlProviderKind.make.
- ProjectService reads ServerSettings for per-project providers, so the
  project sync test provides ServerSettings.layerTest.
- Upstream's review guide diffs use useDiffThemeName, picking up the
  fork's syntax theme like every other diff surface.
- MessagesTimeline.logic lost a DateTime import both sides added.

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.