Repository navigation
chore: sync upstream (2026-11-21) - #34
Merged
Merged
Conversation
…6499) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ents that failed (pingdotgg#39536) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#39552) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#39548) Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
pingdotgg#39562) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…n closes (pingdotgg#39569) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#39579) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#39598) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#39605) Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…when they exit (pingdotgg#38348) Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…a failure (pingdotgg#39596) Co-authored-by: Ryan McDonough <Ryan@r2n.io> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ands (pingdotgg#39618) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…lized scroll windows (pingdotgg#39574) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…es (pingdotgg#39636) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#39643) Co-authored-by: Geezy <igor.licko@gloryck.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…helper (pingdotgg#39665) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…40149) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#40069) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ffort summaries (pingdotgg#40136) Co-authored-by: thecsguy <344173356+itsthecsguy@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…CODE_TANSTACK_SOURCE (pingdotgg#40207) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit b32f90b)
…rt grow-in Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit 4ce558b)
Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit cbc50d8)
…ser during dictation (pingdotgg#40253)
…was removed upstream (pingdotgg#40261)
Co-authored-by: Geezy <igor.licko@gloryck.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…he whole Git index (pingdotgg#40268)
…11-21 # Conflicts: # apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx # apps/mobile/src/features/layout/workspace/WorkspaceNativeTabs.ios.tsx # apps/mobile/src/features/layout/workspace/WorkspaceTabsContext.tsx # apps/mobile/src/features/threads/ThreadFeed.tsx # apps/mobile/src/features/threads/git/GitOverviewSheet.tsx # apps/mobile/src/features/threads/thread-inspector-navigation.test.tsx # apps/mobile/src/features/threads/thread-inspector-preview.tsx # apps/mobile/src/lib/markdownDocument.ts # apps/mobile/src/state/entities.ts # apps/mobile/src/state/use-selected-thread-git-actions.ts # apps/server/src/mcp/McpHttpServer.ts # apps/server/src/mcp/toolkits/project/handlers.ts # apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts # apps/server/src/orchestration-v2/ProviderSessionManager.test.ts # apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts # apps/server/src/orchestration-v2/ProviderTurnStartService.testkit.ts # apps/server/src/orchestration-v2/ProviderTurnStartService.ts # apps/server/src/provider/Drivers/AntigravityDriver.ts # apps/server/src/provider/agentContextBudget.json # apps/server/src/ws.ts # apps/web/src/components/GitActionsControl.tsx # apps/web/src/components/chat/MarkdownThreadLink.tsx # apps/web/src/components/desktopUpdate.logic.ts # packages/provider-acp/src/server/adapter.ts # packages/provider-opencode/src/server/adapter.ts # packages/shared/src/threadLinks.ts # packages/source-control-gitlab/src/server/GitLabCli.ts # pnpm-lock.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges upstream
pingdotgg/t3codemaininto the fork:759a173e15..c1464d6774(607 commits), as a merge commit with upstream history kept.Conflicts and how they were resolved
28 files conflicted. In each, upstream's change was taken and the fork's intent from
.github/fork-manifest.txtre-applied.Server and packages
McpHttpServer.ts,ProviderTurnStartService.ts,ws.ts,desktopUpdate.logic.ts: import-only. Kept the fork'sFork:header and upstream's new imports.desktopUpdate.logic.tsimports bothCLI_RELEASE_REPOSITORY(fork) anddesktopUpdateChannelOf(upstream).CodexAdapterV2.ts,provider-acp/adapter.ts,provider-opencode/adapter.ts: kept both the fork'sappliesAccountEnvironmentand upstream's newchecksVersionAtHandshake.ProviderSessionManager.test.ts,ProviderTurnStartService.test(kit).ts: kept both the fork's git-account fixtures and upstream's new ones (eventStreamsEnded,PullRequestServicemock).mcp/toolkits/project/handlers.ts:t3_project_readnow returns upstream'swithSavedProjectSettings(project)plus the fork'sgitAccountmetadata.AntigravityDriver.ts: upstream added per-threadprocessEnvironment. The fork's account overlay is now applied on top of the thread environment, so the bound git identity still wins.GitLabCli.ts: with an account credential, the fork'sGITLAB_HOST/GITLAB_TOKENenv applies. Without one, upstream's host env and its token stripping for caller-named hosts apply.packages/shared/threadLinks.ts: upstream movedrelabelThreadLinkstothreadLinksCopy.ts. The fork's rule that keeps scoped v2 links navigable when uncached moved with it, and the manifest anchor was repointed.agentContextBudget.json: re-measured. Upstream's values plus the fork's git-account tool givemcpToolListJsonBytes59803.pnpm-lock.yaml: regenerated withvp i. All patches apply, including the fork-onlyexpo-modules-autolinkingpatch.Web
GitActionsControl.tsx: upstream split thread logic out intoThreadGitActionsControland anownerprop. The fork's account guard before commit/push/PR now targetsthreadRefplusowner.projectId; the server resolves a saved thread's project.MarkdownThreadLink.tsx: kept upstream's new linked-environment chip, followed by the fork's branch that keeps uncached scoped links openable.Mobile
createWorkspaceStackNavigator.ios.tsx/WorkspaceNativeTabs.ios.tsx: upstream replacedWorkspaceSidebarTabsFooterwithWorkspaceTabDock. Expanded iPads still get the fork'sIpadSidebarActionsat the foot of the sidebar column. Compact layouts render upstream'sWorkspaceTabDock(columnplacement inside the pre-iOS 26 JS sidebar slot,windowotherwise) under the fork's visibility rule.WorkspaceTabsContext.tsx: upstream'ssaveMobilePreferencescommand, and the fork'sselectedTaboverride is kept.ThreadFeed.tsx,state/entities.ts,markdownDocument.ts:useLiveThreadLinkLabels(markdown, env, linked, parent)combines upstream's linked-environment labels with the fork's provider-native subagent links and titles. Both new markdown helpers are kept.GitOverviewSheet.tsx,use-selected-thread-git-actions.ts: upstream's repository-target support, plus the fork's account guard and its "Using this machine's git login" row.thread-inspector-preview.tsx: kept the fork's local inspector stack (file drill-ins, expand-to-modal). Upstream'sThreadInspectorHeadernow comes from its newthread-inspector-header.tsx, and upstream's linked-thread inspector is kept.thread-preview-route.tsxstays deleted, as before.thread-inspector-navigation.test.tsx:setup()takes both upstream'sinspectorSupportedand the fork'ssheet.Fork adaptations after the merge
fix(mobile): keep the preview tunnel building on iOS 17: upstream's newt3-preview-tunnelmodule declared:ios, '18.0'. Its APIs (ProxyConfiguration,WKWebsiteDataStore.proxyConfigurations,NWListener) are iOS 17.0, so the podspec is lowered to 17.0, likeT3VoiceTranscriptionandT3WebSocket. Added to the manifest.fix(mobile): repository picker list uses the fork's native scroll renderer: upstream added a secondLegendListtoNewTaskContextPickerScreens.tsx, where the fork had switched torenderNativeScrollView.ThreadContextChip.tsxno longer has thegt("Open thread")tooltip after upstream's hover-card change. The fork's "uncached targets stay openable" behaviour is the unconditionalLink, now anchored onto="/$environmentId/$threadId".enabling-fork-ci --rewrite-runners --prefix T3CODErewrote the one new Blacksmith label, on release.yml's upstream-only "Check the update feed" job. No newpingdotgg/t3codeguards that the fork needs to run, and no new macOS jobs inci.yml.Verification
bash scripts/check-fork-manifest.sh: 574 entries present.src/gitAccounts,Manager,npmRelease,PullRequestService,mcp/toolkits/project, plusProviderSessionManager,ProviderTurnStartService,DriversandAgentContextBudget: 674 passed.ClaudeSkills.test.tsfails 2 cases on this Mac only; the file and everything it imports are identical to upstream, and the failure is macOS-path specific (CI runs Linux).GitAccountsSettings,MarkdownThreadLink,desktopUpdate.logic(19 passed).remoteRegistration,thread-inspector-navigation,use-selected-thread-git-actions,src/lib(902 passed).threadLinks(20 passed).vp run check:changed: format, lint, knip, unused patches, graphql and React compiler pass. Typecheck passes after the scroll-renderer fix. The local test step hit its 900s cap while the iOS build had the machine; CI runs the full suites.iOS 17
apps/mobile/app.config.tskeepsdeploymentTarget: "17.0", so the proof ran on this Mac.t3-preview-tunnel. Its podspec declared iOS 18.0, so it was lowered to 17.0 (above); every API it uses is iOS 17.0 or earlier. Upstream's new Apple Speech code is behind#available(iOS 26, *).react-native-screensmoved from the fork tarball t3.58 to t3.61. Nothing ininfra/relayorpackages/contracts/src/relay.tsusesiosMajorVersion. No new JS paths need iOS 18./opt/homebrew/bin/pod install, then xcodebuild Release forgeneric/platform=iOS Simulatorwith Xcode 26.6: BUILD SUCCEEDED. Every deployment target is at most 17.0 (15.1, 16.4 and 17.0 only).check-ios17-libcxx-imports.sh: 7 Mach-O files import 277 libc++ symbols, all exported by iOS 17.0.check_runtime_symbols.py --runtime 17.0: 10986 imports checked, nothing missing.native-surfaces-openpassed with 0 failed steps on both the iPhone and the iPad (--pose ipad).CI
All 19 checks passed on
fe00174.Opus 5.5 (
claude-opus-5-5) via Claude Code in T3 Code.