Repository navigation
chore: merge upstream/main into fork (2026-11-13) - #577
Merged
Merged
Conversation
…35618) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…update (pingdotgg#33945) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#25241) Co-authored-by: Yukun Shan <92423096+nateEc@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#27851) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#28822) Co-authored-by: ParasN <25337333+ParasN@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ed (pingdotgg#27436) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#28481) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…n earlier snapshot (pingdotgg#29366) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#24019) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#24179) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#24112) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#23484) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#25237) Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#27079) Co-authored-by: Toni Angerer <toni@MBP-von-Toni-5.fritz.box> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…4573) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#23934) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#24156) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#24674) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#23627) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… up to date (pingdotgg#24338) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ute (pingdotgg#24099) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#25596) Co-authored-by: Tin Zeljar <35663757+Zheruel@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ead of running in the project checkout (pingdotgg#23618) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…hread's conversation (pingdotgg#36103)
…thread's whole history (pingdotgg#36100)
…ingdotgg#36104) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…eady (pingdotgg#35327) Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ry thread payload (pingdotgg#36146)
…esktop-settings.json (pingdotgg#36168)
…put (pingdotgg#36115) Co-authored-by: Claude Haiku 5.5 <noreply@anthropic.com>
…g#33566) Co-authored-by: maria-rcks <maria@kuuro.net>
# Conflicts: # .gitignore # README.md # apps/desktop/src/main.ts # apps/mobile/src/features/home/HomeRouteScreen.tsx # apps/mobile/src/features/home/useThreadListActions.test.ts # apps/mobile/src/features/home/useThreadListActions.ts # apps/mobile/src/features/threads/ComposerCommandPopover.tsx # apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx # apps/mobile/src/features/threads/ThreadPullRequestsSheet.tsx # apps/mobile/src/features/threads/ThreadQueueControl.tsx # apps/mobile/src/features/threads/ThreadRouteScreen.tsx # apps/mobile/src/features/threads/use-composer-command-menu.ts # apps/mobile/src/lib/threadActivity.ts # apps/mobile/src/state/queries.test.ts # apps/mobile/src/state/queries.ts # apps/mobile/src/state/thread-order.ts # apps/mobile/src/state/use-thread-composer-state.ts # apps/server/scripts/migrate-dev-db.ts # apps/server/src/git/GitManager.test.ts # apps/server/src/mcp/McpHttpServer.test.ts # apps/server/src/mcp/OrchestratorMcpService.ts # apps/server/src/mcp/OrchestratorMcpToolkit.integration.test.ts # apps/server/src/mcp/TaskCancelUsageLimit.integration.test.ts # apps/server/src/mcp/toolkits/core.test.ts # apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts # apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts # apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts # apps/server/src/orchestration-v2/Orchestrator.ts # apps/server/src/orchestration-v2/ProjectionStore.ts # apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts # apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts # apps/server/src/orchestration-v2/ProviderTurnStartService.ts # apps/server/src/orchestration-v2/PullRequestWatchReactor.ts # apps/server/src/orchestration-v2/SelectionRestart.integration.test.ts # apps/server/src/orchestration-v2/ShellStream.ts # apps/server/src/orchestration-v2/ThreadLaunchService.ts # apps/server/src/orchestration-v2/pullRequestWatch.test.ts # apps/server/src/orchestration-v2/pullRequestWatch.ts # apps/server/src/preview/ServerBrowser.test.ts # apps/server/src/preview/ServerBrowser.ts # apps/server/src/preview/ServerBrowserPage.ts # apps/server/src/project/RepositoryIdentityResolver.ts # apps/server/src/provider/AntigravityInstallation.test.ts # apps/server/src/provider/Drivers/CodexDriver.ts # apps/server/src/provider/ProviderInstanceRegistry.test.ts # apps/server/src/provider/agentContextBudget.json # apps/server/src/server.ts # apps/server/src/terminal/Manager.ts # apps/server/src/usage/UsageService.test.ts # apps/server/src/usage/UsageService.ts # apps/server/src/ws.ts # apps/web/src/components/BranchToolbarBranchSelector.tsx # apps/web/src/components/ChatMarkdown.browser.test.tsx # apps/web/src/components/ChatMarkdown.tsx # apps/web/src/components/ChatView.tsx # apps/web/src/components/ComposerPromptEditorTiptap.citationDraft.browser.test.tsx # apps/web/src/components/Sidebar.logic.test.ts # apps/web/src/components/Sidebar.logic.ts # apps/web/src/components/Sidebar.tsx # apps/web/src/components/ThreadTerminalDrawer.test.ts # apps/web/src/components/ThreadTerminalDrawer.tsx # apps/web/src/components/chat/ChatComposer.tsx # apps/web/src/components/chat/ComposerCommandMenu.tsx # apps/web/src/components/chat/MarkdownExternalLink.tsx # apps/web/src/components/chat/MessagesTimeline.browser.test.tsx # apps/web/src/components/chat/MessagesTimeline.logic.test.ts # apps/web/src/components/chat/OpenInPicker.tsx # apps/web/src/components/chat/QueuedRunsControl.browser.test.tsx # apps/web/src/components/chat/TimelineWorkEntryRow.tsx # apps/web/src/components/chat/turnDetailAnnouncement.ts # apps/web/src/components/chat/useComposerSend.ts # apps/web/src/components/chat/useQueuedRunEdit.ts # apps/web/src/components/chat/useThreadLifecycle.tsx # apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx # apps/web/src/components/settings/CodexSetupSection.tsx # apps/web/src/components/settings/ConnectionsSettings.tsx # apps/web/src/components/settings/settingsSearch.ts # apps/web/src/components/sidebar/SidebarDraftBlock.tsx # apps/web/src/components/sidebar/SidebarThreadRow.tsx # apps/web/src/composer-logic.test.ts # apps/web/src/composerDraftStore.ts # apps/web/src/hooks/useThreadActionMenu.ts # docs/user/thread-sidebar.md # packages/client-runtime/src/state/commandPermissions.test.ts # packages/client-runtime/src/state/entities.test.ts # packages/client-runtime/src/state/models.ts # packages/client-runtime/src/state/threadExecution.test.ts # packages/client-runtime/src/state/threadExecution.ts # packages/client-runtime/src/work-log/itemDetail.ts # packages/client-runtime/src/work-log/userInput.test.ts # packages/client-runtime/src/work-log/userInput.ts # packages/contracts/src/orchestrationV2.ts # packages/contracts/src/orchestratorMcp.ts # packages/contracts/src/rpc.ts # packages/provider-acp/src/server/adapter.ts # packages/provider-cursor/src/server/CursorSdk.test.ts # packages/provider-cursor/src/server/adapter.ts # packages/provider-opencode/src/server/adapter.test.ts # packages/provider-opencode/src/server/driver.ts # packages/shared/src/orchestrationV2PendingBackgroundWork.test.ts # packages/source-control-definitions/src/composerPullRequestMatches.test.ts # packages/source-control-definitions/src/composerPullRequestMatches.ts
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.
What's in this sync
Adds 458 upstream commits from November 12–13.
New features include keeping the computer awake while agents work, Codex cyber access program selection, managed Antigravity goals and CLI updates, OpenCode server usage limits, spreadsheet row/column resizing, folder drops to add projects, secret validation and mobile secret visibility.
Fixes cover provider prompts and recovery, thread navigation and queue handling, preview rendering, GitHub watch events, and remote connections. Performance work reduces history reads for long threads, speeds terminal attachment over slow connections and reduces mobile startup data.
New features
Notable performance changes
Remaining commits
Discord announcements were not used: the channel returned only October 20 messages, with no matching crossposts or announcement embeds.
Integration
Base:
1f27a682e16a2ab872ca34f57f2bba35e9394af5(main). Pinned upstream:f313d0a6cb843551fb60e57a454a71e71a3a8c04. Range:1f27a682e16a2ab872ca34f57f2bba35e9394af5..f313d0a6cb843551fb60e57a454a71e71a3a8c04. No parent PR. Before merging, the fork had 659 fork-only commits and was missing 458 upstream commits.Current
mainadvanced while verification ran. A second merge commit incorporates the GitHub file-link and Slack image-link changes from #575 and #576; upstream history remains intact.Conflict resolutions
Verification
check:changedwith browser test execution excluded under the requested restriction. The broad 625-file test phase reached its 900-second timeout; it is not a passing full-suite result. The earlier parallel typecheck failure is superseded by the successful final phase and focused checks.git diff --checkis clean for resolutions and non-patch changes; the upstream Pierre dependency patch carries space-before-tab patch context, preserved unchanged..envconfigured). Browser tests, runtime UI automation, merges and releases are excluded per the requested scope.Earlier runs were settled as superseded: one failed before a checkout was created; the other had a clean checkout, no pinned upstream/merge/unpushed work, and no recovery notes. Their branches/worktrees were left in place.
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.