Repository navigation
chore(sync): merge upstream/main into fork - #313
Merged
Merged
Conversation
…ghted (pingdotgg#18901) Co-authored-by: Claude Opus 5.5 <[email protected]>
…dotgg#18369) Co-authored-by: maria-rcks <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
pingdotgg#12474) Co-authored-by: Claude Fable 5.1 <[email protected]> Co-authored-by: Yash Singh <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
…pingdotgg#12469) Co-authored-by: Claude Fable 5.1 <[email protected]> Co-authored-by: Yash Singh <[email protected]>
…tgg#12465) Co-authored-by: Yash Singh <[email protected]>
…nger drop clients (pingdotgg#19205) Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#19207) Co-authored-by: Claude Opus 5.5 <[email protected]>
… Google group (pingdotgg#18955) Co-authored-by: PR Batch Tester <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
…nt finishes (pingdotgg#18996) Co-authored-by: PR Batch Tester <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#19162) Co-authored-by: Simone <[email protected]>
…y minute (pingdotgg#19374) Co-authored-by: Claude Opus 5.5 <[email protected]>
…pingdotgg#19368) Co-authored-by: Claude Opus 5.5 <[email protected]>
…dotgg#19375) Co-authored-by: Claude Opus 5.5 <[email protected]>
…pingdotgg#19372) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ged tunnel (pingdotgg#19383) Co-authored-by: Claude Opus 5.5 <[email protected]>
pingdotgg#19385) Co-authored-by: Claude Opus 5.5 <[email protected]>
…o text model is set (pingdotgg#19386) Co-authored-by: Claude Opus 5.5 <[email protected]>
…sh-only (pingdotgg#19389) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#19394) Co-authored-by: Claude Opus 5.5 <[email protected]>
…se a resize drag (pingdotgg#19395) Co-authored-by: Claude Opus 5.5 <[email protected]>
…s connected (pingdotgg#19400) Co-authored-by: Claude Opus 5.5 <[email protected]>
…w markup (pingdotgg#19401) Co-authored-by: Claude Opus 5.5 <[email protected]>
…sshd (pingdotgg#19402) Co-authored-by: Claude Opus 5.5 <[email protected]>
…offers a relink (pingdotgg#19379) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ds (pingdotgg#19399) Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
…s at the same time (pingdotgg#19411) Co-authored-by: Claude Opus 5.5 <[email protected]>
…vent loop (pingdotgg#19430) Co-authored-by: Aaron Queen <[email protected]> Co-authored-by: Daniyal <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
…d silently (pingdotgg#19417) Co-authored-by: Claude Opus 5.5 <[email protected]>
…otgg#19429) Co-authored-by: Claude Opus 5.5 <[email protected]>
…pingdotgg#19432) Co-authored-by: puccez <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: luke2x <[email protected]>
…keep their own history (pingdotgg#19425) Co-authored-by: Claude Opus 5.5 <[email protected]>
…e history (pingdotgg#19423) Co-authored-by: Eldar Politkin <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
…gdotgg#19418) Co-authored-by: Tanner Sharon <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
# Conflicts: # apps/mobile/src/features/threads/ThreadFeed.tsx # apps/mobile/src/features/threads/use-composer-command-menu.ts # apps/mobile/src/state/queries.ts # apps/server/src/mcp/McpHttpServer.ts # apps/server/src/mcp/OrchestratorMcpService.activity.test.ts # apps/server/src/mcp/OrchestratorMcpService.ts # apps/server/src/mcp/TaskCancelNativeSubagent.integration.test.ts # apps/server/src/mcp/toolkits/orchestrator/tools.ts # apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts # apps/server/src/orchestration-v2/Orchestrator.ts # apps/server/src/orchestration-v2/ThreadLaunchService.test.ts # apps/server/src/orchestration-v2/ThreadLaunchService.ts # apps/server/src/orchestration-v2/ThreadStop.test.ts # apps/server/src/persistence/Sqlite.ts # apps/web/src/components/ChatView.tsx # apps/web/src/components/chat/ChatComposer.tsx # apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx # apps/web/src/components/chat/OpenInPicker.tsx # apps/web/src/components/chat/V2LifecycleRow.tsx # apps/web/src/composer-logic.ts # packages/provider-cursor/src/server/CursorSdk.test.ts # packages/shared/src/composerPullRequestMatches.test.ts # packages/shared/src/composerPullRequestMatches.ts
This was referenced Oct 14, 2026
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.
The fork was 113 upstream commits behind and 351 commits ahead. This merges upstream/main through
7ac952c630ef8a60d14ca8f6a0c7adce33db4bae, retaining upstream history and the fork's functionality.Resolved 23 conflicted files and reviewed the overlapping clean merges:
Validation:
Merge with Create a merge commit. It keeps upstream history and the merge base for the next sync.
Model: gpt-6.1-sol. Harness: Codex in T3 Code.