Skip to content

chore: sync with upstream pingdotgg/t3code main - #151

Merged
yordis merged 66 commits into
mainfrom
yordis/chore-sync-upstream-20261024-3
Oct 25, 2026
Merged

yordis merged 66 commits into
mainfrom
yordis/chore-sync-upstream-20261024-3

Conversation

@yordis

@yordis yordis commented Oct 25, 2026

Copy link
Copy Markdown
Member
  • Combined Claude's T3 Code launch-mark settings env with upstream's tool-search override so both reach the SDK settings env instead of one replacing the other.
  • Took upstream's forge-hook failure classification and dropped the fork's gh stderr merge-reason matching, since GitHub merges now go through the API where the refusal is already read from the merge state.
  • Kept the merge refusal on pull request operation errors so the bypass offer (0024) keeps working with upstream's new unavailable-requirement error mapping.
  • Kept the model-picker origin memory (0032), the secrets settings section (0033), and the secret-backed instance reload (0016) alongside upstream's new Beta settings and refresh structure.
  • Condensed fork comments to satisfy upstream's new four-line comment cap.
  • Adapted the fork's pull request service test to upstream's relocated fake pull request provider.

t3dotgg and others added 30 commits October 24, 2026 04:05
…e search (pingdotgg#24343)

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

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

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

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

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

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

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rd is closed (pingdotgg#24363)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…with the sidebar collapsed (pingdotgg#23839)

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

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…to the delegator (pingdotgg#23795)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… error after the SDK's late resume (pingdotgg#24231)

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

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

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…f Shiki (pingdotgg#24544)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 24 commits October 24, 2026 17:34
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#24610)

Co-authored-by: lovelycodemonkey <ghassemimahyad@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#24622)

Takes over pingdotgg#23490 by Ennio Cuteri, adding a frame limit on the settle loop and reporting positioned when its target disappears.

Co-authored-by: Ennio Cuteri <ennio.cuteri@gmail.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…g#24616)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Afonso Ferreira <afonsoferreira29@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…S 26.6 (pingdotgg#24492)

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

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

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

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

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
… per session (pingdotgg#24654)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pstream-20261024-3

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>

# Conflicts:
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
#	apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
#	apps/server/src/provider/ClaudeProvider.ts
#	apps/server/src/provider/ProviderInstanceRegistry.ts
#	apps/server/src/provider/ProviderRegistry.ts
#	apps/server/src/pullRequest/PullRequestService.ts
#	apps/server/src/vcs/VcsProcess.test.ts
#	apps/server/src/vcs/VcsProcess.ts
#	apps/web/src/components/chat/ModelPickerContent.tsx
#	apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
#	apps/web/src/components/settings/SettingsSidebarNav.tsx
#	apps/web/src/components/settings/settingsSearch.ts
#	packages/contracts/src/rpc.ts
#	packages/contracts/src/vcs.ts
#	packages/source-control-github/src/server/GitHubPullRequestProvider.test.ts
#	scripts/dev-runner.test.ts
@yordis
yordis merged commit 2d0f49c into main Oct 25, 2026
15 of 16 checks passed
@yordis
yordis deleted the yordis/chore-sync-upstream-20261024-3 branch October 25, 2026 02:53
@cursor

cursor Bot commented Oct 25, 2026

Copy link
Copy Markdown

This PR is too large for Bugbot to review. It changes 105,353 lines and 4,011,952 characters. Split the change into smaller pull requests to get a review.

@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. labels Oct 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants