sync: classic-merge upstream/main (1de563c149) into fork/dev - #477
Merged
Merged
Conversation
…iew (pingdotgg#11075) Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…11825) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#11665) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
…g#12808) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…off (pingdotgg#12807) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…s page (pingdotgg#12536) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…2243) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…2805) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
pingdotgg#12833) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…nch (pingdotgg#12623) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com> Co-authored-by: Cursor <cursoragent@cursor.com>
…ngdotgg#12848) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…3c149 # Conflicts: # .agents/skills/test-t3-app/SKILL.md # .agents/skills/test-t3-mobile/SKILL.md # .github/VOUCHED.td # apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx # apps/mobile/src/features/home/HomeHeader.tsx # apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx # apps/mobile/src/features/threads/ThreadRouteScreen.tsx # apps/mobile/src/features/threads/thread-list-items.tsx # apps/mobile/src/features/threads/thread-list-v2-items.tsx # apps/mobile/src/native/StackHeader.tsx # apps/server/src/mcp/PreviewAutomationBroker.ts # apps/server/src/orchestration/Layers/ProviderCommandReactor.ts # apps/server/src/persistence/Layers/ProjectionThreads.ts # apps/server/src/persistence/Services/ProjectionThreads.ts # apps/server/src/pullRequest/PullRequestService.ts # apps/server/src/server.test.ts # apps/server/src/textGeneration/TextGeneration.ts # apps/server/src/vcs/GitVcsDriver.test.ts # apps/server/src/vcs/VcsProcess.ts # apps/server/src/ws.ts # apps/web/src/components/BranchToolbar.tsx # apps/web/src/components/GitActionsControl.tsx # apps/web/src/components/ProjectScriptsControl.tsx # apps/web/src/components/Sidebar.tsx # apps/web/src/components/chat/ChatHeader.tsx # apps/web/src/components/chat/ComposerBannerStack.tsx # apps/web/src/components/chat/MessagesTimeline.tsx # apps/web/src/components/chat/OpenInPicker.tsx # apps/web/src/hooks/useThreadActions.ts # packages/contracts/src/ipc.ts # packages/contracts/src/providerRuntime.ts # packages/contracts/src/vcs.ts # pnpm-workspace.yaml
ThreadStatusPresentation only has StatusTone + kind/pulse. The weld left iconColor/iconBackground on plan-ready and typecheck failed.
Fork ElectronApp.Service only exposes setAsDefaultProtocolClient. Upstream's harness field does not exist on the service type.
Schema mapFields is a value; use its Type for row decode. Fork ledger
tests still called removed NodeSqliteClient.layerMemory — use
layer({ filename: ':memory:' }) like upstream migration tests.
github-actions
Bot
added
the
📱 Native Change
…oser banners Archive undo tests hit previewWorktreeCleanup without a mock; optional-chain the tagged result so a missing preview degrades to a plain archive. Isolate composer banner tests so a stub Button mock cannot steal buttonVariants.
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
20 participants
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.
Classic-merge pingdotgg/t3code
mainthrough1de563c149intofork/dev(107 commits after #476).Incoming includes device tool versions and remote updates, undo settle/snooze/archive, mobile header/platform split, OTLP logs, PR cache, and pingdotgg#12544 dropping the
msgpackr-extractplaceholder.Weld: keep the fork's server-side queue (
thread.message-queued). Do not takequeuedMessageStore. Keepdfx: 1.0.16,msgpackr-extract: true,requireWorktreebeforethread.create, HashMap command model.Merge with
gh pr merge --mergeonly afterpnpm pr:readyand required checks are green.