Repository navigation
chore(merge): sync upstream/main into fork (2026-10-19) - #45
Merged
Merged
Conversation
…g#20980) Co-authored-by: Paul <paul@local>
pingdotgg#20069) Co-authored-by: Aaron Queen <bompus@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#19937) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#19019) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…17922) Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
…ed to merge (pingdotgg#18232) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…#18832) Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: GPT-6.1 Sol <noreply@openai.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… attachment (pingdotgg#21101) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Tejas Rahane <17571323+trahane@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#14786) Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ork advice (pingdotgg#17569) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…sh token (pingdotgg#21134) Co-authored-by: Aidid Haiqal <syafdo02@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…no origin (pingdotgg#20412) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#20889) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#16026) Co-authored-by: Arthur Katcher <192321283+arthurkatcher@users.noreply.github.com>
…9525) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
pingdotgg#17614) Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
…tgg#17743) Co-authored-by: macodev00 <macodev00@users.noreply.github.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
…pingdotgg#21481) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#13903) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#15044) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…14284) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…ngdotgg#18423) Co-authored-by: GPT-6.1 Sol <noreply@openai.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#20349) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#16040) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… without permission (pingdotgg#20237) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…ingdotgg#19648) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#19968) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…nge (pingdotgg#11013) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ill (pingdotgg#20051) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…uanian, Basque or Azerbaijani locale (pingdotgg#19616) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… provider (pingdotgg#18467) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…le can resume one (pingdotgg#21473) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
…date (pingdotgg#21688) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ners (pingdotgg#21699) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…re you send (pingdotgg#21659) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#21070) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…026-10-19 # Conflicts: # apps/desktop/package.json # apps/desktop/src/app/DesktopAppIdentity.test.ts # apps/desktop/src/app/DesktopClerk.test.ts # apps/desktop/src/app/DesktopCliCommand.test.ts # apps/desktop/src/app/DesktopCliCommand.ts # apps/desktop/src/app/DesktopCliShim.test.ts # apps/desktop/src/app/DesktopCliShim.ts # apps/desktop/src/app/DesktopLegacyLocalStorage.ts # apps/desktop/src/app/DesktopPreReadyPlatform.test.ts # apps/desktop/src/backend/DesktopBackendConfiguration.ts # apps/desktop/src/preview/BrowserSession.ts # apps/desktop/src/preview/Manager.test.ts # apps/desktop/src/preview/Manager.ts # apps/desktop/src/updates/updateChannels.ts # apps/desktop/src/window/DesktopWindow.ts # apps/desktop/src/wsl/DesktopWslEnvironment.test.ts # apps/desktop/src/wsl/DesktopWslEnvironment.ts # apps/desktop/src/wsl/DesktopWslServerTree.test.ts # apps/mobile/app.config.ts # apps/mobile/package.json # apps/mobile/src/Stack.tsx # apps/mobile/src/components/ComposerContextAttachment.tsx # apps/mobile/src/components/ComposerEditor.tsx # apps/mobile/src/components/FilePreview.tsx # apps/mobile/src/components/T3Wordmark.tsx # apps/mobile/src/components/ui/Button.android.tsx # apps/mobile/src/components/ui/Button.tsx # apps/mobile/src/components/ui/Dialog.android.tsx # apps/mobile/src/components/ui/Dialog.tsx # apps/mobile/src/components/ui/NativeSwitch.android.tsx # apps/mobile/src/components/ui/NavigationRow.tsx # apps/mobile/src/components/ui/NumberField.tsx # apps/mobile/src/components/ui/Sheet.android.tsx # apps/mobile/src/components/ui/Sheet.tsx # apps/mobile/src/features/agent-awareness/remoteRegistration.ts # apps/mobile/src/features/browser/PreviewStreamWebView.tsx # apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx # apps/mobile/src/features/devices/DeviceStreamWebView.tsx # apps/mobile/src/features/diagnostics/SettingsDiagnosticsRouteScreen.tsx # apps/mobile/src/features/files/AttachmentFileScreen.tsx # apps/mobile/src/features/files/FileTreeBrowser.tsx # apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx # apps/mobile/src/features/files/WorkspaceFileWebPreview.tsx # apps/mobile/src/features/home/HomeScreen.tsx # apps/mobile/src/features/home/ThreadListToolbar.tsx # apps/mobile/src/features/home/useThreadListActions.ts # apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx # apps/mobile/src/features/projects/AddProjectScreen.tsx # apps/mobile/src/features/pull-requests/PullRequestInlineCommentScreen.tsx # apps/mobile/src/features/pull-requests/PullRequestListFilters.tsx # apps/mobile/src/features/pull-requests/PullRequestMergeControls.tsx # apps/mobile/src/features/pull-requests/PullRequestPresentation.tsx # apps/mobile/src/features/pull-requests/PullRequestReviewersScreen.tsx # apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx # apps/mobile/src/features/pull-requests/PullRequestToolbar.android.tsx # apps/mobile/src/features/pull-requests/guide/PullRequestGuideScreen.tsx # apps/mobile/src/features/pull-requests/pullRequestActions.ts # apps/mobile/src/features/pull-requests/pullRequestStatus.ts # apps/mobile/src/features/pull-requests/usePullRequestAction.ts # apps/mobile/src/features/pull-requests/usePullRequestListActions.ts # apps/mobile/src/features/pull-requests/usePullRequestThreads.ts # apps/mobile/src/features/review/ReviewSheet.tsx # apps/mobile/src/features/settings/SettingsAboutRouteScreen.tsx # apps/mobile/src/features/settings/SettingsNotificationsRouteScreen.tsx # apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx # apps/mobile/src/features/threads/CustomSnoozeSheet.ios.tsx # apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx # apps/mobile/src/features/threads/NewTaskDraftScreen.tsx # apps/mobile/src/features/threads/NewTaskRouteScreen.tsx # apps/mobile/src/features/threads/QuestionAttachments.tsx # apps/mobile/src/features/threads/ThreadAgentsSheet.tsx # apps/mobile/src/features/threads/ThreadArrangementSheet.tsx # apps/mobile/src/features/threads/ThreadComposer.tsx # apps/mobile/src/features/threads/ThreadDetailScreen.tsx # apps/mobile/src/features/threads/ThreadFeed.tsx # apps/mobile/src/features/threads/ThreadGitControls.tsx # apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx # apps/mobile/src/features/threads/ThreadQueueControl.tsx # apps/mobile/src/features/threads/ThreadRouteScreen.tsx # apps/mobile/src/features/threads/ThreadSettingsSheet.tsx # apps/mobile/src/features/threads/git/GitOverviewSheet.tsx # apps/mobile/src/features/threads/new-task-flow-provider.tsx # apps/mobile/src/features/threads/thread-work-log.tsx # apps/mobile/src/features/threads/use-composer-command-menu.ts # apps/mobile/src/features/threads/use-thread-list-v2-shelf-preferences.ts # apps/mobile/src/features/threads/userMessageIntentBadge.test.ts # apps/mobile/src/features/threads/userMessageIntentBadge.ts # apps/mobile/src/features/threads/worktree-setup-sheet.android.tsx # apps/mobile/src/features/workspace/AndroidWorkspaceNavigation.tsx # apps/mobile/src/features/workspace/AndroidWorkspaceSidebar.android.tsx # apps/mobile/src/features/workspace/android-workspace-navigation-colors.ts # apps/mobile/src/lib/android-workspace-navigation.ts # apps/mobile/src/lib/atomic-file.ts # apps/mobile/src/lib/attachmentDocument.ts # apps/mobile/src/lib/layout.test.ts # apps/mobile/src/lib/layout.ts # apps/mobile/src/lib/useFontFamily.ts # apps/mobile/src/native/useOpenPullRequest.ts # apps/mobile/src/reactCompilerCoverage.test.ts # apps/mobile/src/state/mediaActions.ts # apps/mobile/src/state/use-composer-drafts.ts # apps/mobile/src/state/use-thread-composer-state.ts # apps/mobile/src/state/use-thread-detail.ts # apps/mobile/src/state/use-thread-outbox-drain.ts # apps/mobile/src/state/use-thread-selection.ts # apps/server/package.json # apps/server/src/auth/RpcAuthorization.ts # apps/server/src/auth/SessionStore.ts # apps/server/src/binCli.ts # apps/server/src/cli/invocation.test.ts # apps/server/src/cli/invocation.ts # apps/server/src/cli/theme.ts # apps/server/src/cli/trace.ts # apps/server/src/cli/triage.ts # apps/server/src/cloud/bootService.ts # apps/server/src/device/DeviceService.test.ts # apps/server/src/git/GitManager.test.ts # apps/server/src/git/linkCreatedPullRequest.test.ts # apps/server/src/git/linkCreatedPullRequest.ts # apps/server/src/mcp/McpHttpServer.ts # apps/server/src/mcp/OrchestratorMcpService.activity.test.ts # apps/server/src/mcp/OrchestratorMcpToolkit.integration.test.ts # apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts # apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts # apps/server/src/orchestration-v2/CommandPolicy.test.ts # apps/server/src/orchestration-v2/Orchestrator.ts # apps/server/src/orchestration-v2/RunExecutionService.ts # apps/server/src/orchestration-v2/ThreadFind.ts # apps/server/src/orchestration-v2/ThreadSettlementService.ts # apps/server/src/orchestration-v2/UserFacingErrors.ts # apps/server/src/orchestration-v2/workflowAgentAnswers.test.ts # apps/server/src/orchestration-v2/workflowAgentAnswers.ts # apps/server/src/outboundHttp.test.ts # apps/server/src/outboundHttp.ts # apps/server/src/persistence/AuthSessions.ts # apps/server/src/persistence/Migrations.ts # apps/server/src/persistence/Migrations/055_OrchestrationV2.test.ts # apps/server/src/persistence/Sqlite.ts # apps/server/src/persistence/reconcileV2PreviewMigration.test.ts # apps/server/src/preview/PortScanner.test.ts # apps/server/src/preview/ServerBrowser.ts # apps/server/src/process/agentScope.ts # apps/server/src/project/AgentSessionScanner.ts # apps/server/src/provider/Drivers/AntigravityUsage.ts # apps/server/src/provider/ProviderInstanceRegistry.test.ts # apps/server/src/provider/ProviderRegistry.ts # apps/server/src/scheduledTasks/ScheduledTaskService.ts # apps/server/src/server.ts # apps/server/src/serverLogger.test.ts # apps/server/src/serviceLauncher.ts # apps/server/src/storageCleanup.test.ts # apps/server/src/storageCleanup.ts # apps/server/src/telemetry/AnalyticsService.test.ts # apps/server/src/telemetry/AnalyticsService.ts # apps/server/src/usage/UsageService.test.ts # apps/server/src/usage/UsageService.ts # apps/server/src/vcs/GitVcsDriver.ts # apps/server/src/vcs/GitVcsDriverCore.ts # apps/server/src/vcs/VcsStatusBroadcaster.ts # apps/server/src/ws.ts # apps/web/index.html # apps/web/package.json # apps/web/src/browser/ElectronBrowserHost.tsx # apps/web/src/components/BranchToolbar.tsx # apps/web/src/components/BranchToolbarEnvModeSelector.tsx # apps/web/src/components/BranchToolbarEnvironmentSelector.tsx # apps/web/src/components/ChatMarkdown.assets.browser.test.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/CommandPalette.logic.ts # apps/web/src/components/CommandPalette.tsx # apps/web/src/components/CommandPaletteResults.tsx # apps/web/src/components/DiffPanel.tsx # apps/web/src/components/GitActionsControl.logic.ts # apps/web/src/components/GitActionsControl.tsx # apps/web/src/components/LegacySidebar.tsx # apps/web/src/components/RightPanelTabs.keyboard.browser.test.tsx # apps/web/src/components/Sidebar.logic.ts # apps/web/src/components/Sidebar.tsx # apps/web/src/components/WorktreeBaseBranchPicker.tsx # apps/web/src/components/chat/ChangedFilesTree.browser.test.tsx # apps/web/src/components/chat/ChangedFilesTree.tsx # apps/web/src/components/chat/ChatComposer.tsx # apps/web/src/components/chat/ComposerPendingUserInputPanel.test.tsx # apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx # apps/web/src/components/chat/HtmlRenderFrame.tsx # apps/web/src/components/chat/MermaidDiagram.tsx # apps/web/src/components/chat/MessagesTimeline.browser.test.tsx # apps/web/src/components/chat/MessagesTimeline.tsx # apps/web/src/components/chat/OpenInPicker.tsx # apps/web/src/components/chat/ThreadDetailsPanel.test.tsx # apps/web/src/components/chat/ThreadDetailsPrRow.browser.test.tsx # apps/web/src/components/chat/ThreadDetailsPrRow.tsx # apps/web/src/components/chat/ZoomableImage.tsx # apps/web/src/components/chat/composerFocusRedirect.ts # apps/web/src/components/desktopUpdate.logic.ts # apps/web/src/components/device/DevicePanel.tsx # apps/web/src/components/device/DeviceStreamView.browser.test.tsx # apps/web/src/components/files/AttachmentFilePreview.tsx # apps/web/src/components/files/BrowserDocumentFrame.tsx # apps/web/src/components/files/FilePreviewPanel.tsx # apps/web/src/components/onboarding/FirstRunGate.tsx # apps/web/src/components/onboarding/WelcomeWizard.import.browser.test.tsx # apps/web/src/components/onboarding/WelcomeWizard.terminal.browser.test.tsx # apps/web/src/components/preview/PreviewView.tsx # apps/web/src/components/pullRequest/LinkPullRequestDialog.tsx # apps/web/src/components/pullRequest/PullRequestDetailPanel.browser.test.tsx # apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx # apps/web/src/components/pullRequest/pullRequestDetail.logic.ts # apps/web/src/components/pullRequest/pullRequestListLines.ts # apps/web/src/components/pullRequest/usePullRequestActions.ts # apps/web/src/components/settings/CliCommandSettingsRow.tsx # apps/web/src/components/settings/IntegrationsSettings.browser.test.tsx # apps/web/src/components/settings/IntegrationsSettings.tsx # apps/web/src/components/settings/ProjectDefaultsSettings.tsx # apps/web/src/components/settings/ProjectSettingsPanel.tsx # apps/web/src/components/settings/SnapShotSettings.browser.test.tsx # apps/web/src/components/settings/SnapShotSettings.tsx # apps/web/src/components/settings/ThemeSettings.tsx # apps/web/src/components/settings/settingsSearch.ts # apps/web/src/components/usage/UsageLimitsPooled.tsx # apps/web/src/hooks/useSettings.ts # apps/web/src/onboarding/firstRun.ts # apps/web/src/pullRequestReference.ts # apps/web/src/terminal/ghostty/surface.ts # docs/internals/mobile-development.md # docs/internals/web-ui.md # packages/client-runtime/package.json # packages/client-runtime/src/handoff.ts # packages/client-runtime/src/state/runtime.test.ts # packages/contracts/src/environment.ts # packages/contracts/src/rpc.ts # packages/contracts/src/settings.ts # packages/contracts/src/threadPullRequest.ts # packages/provider-acp/src/server/adapter.ts # packages/provider-core/src/server/maintenanceResolver.ts # packages/provider-grok/src/server/driver.ts # packages/provider-opencode/src/server/v2/adapter.ts # packages/shared/src/Net.ts # packages/shared/src/atomicWrite.ts # packages/shared/src/cliRelease.ts # packages/shared/src/composerTrigger.ts # packages/shared/src/devHome.ts # packages/shared/src/htmlRender.ts # packages/shared/src/preview.ts # packages/shared/src/promptLinks.ts # packages/shared/src/providerAuthReturnUrl.ts # packages/shared/src/shell.ts # packages/shared/src/usageLimits.ts # packages/source-control-azure-devops/src/server/AzureDevOpsPullRequestProvider.ts # pnpm-lock.yaml # pnpm-workspace.yaml # scripts/build-desktop-artifact.test.ts # scripts/build-desktop-artifact.ts # scripts/dev-runner.test.ts # scripts/dev-runner.ts # vite.config.ts
github-actions
Bot
added
vouch:trusted
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.
Problem
The fork was 879 commits behind
upstream/main, so it missed upstream fixes and features, including the Muse subscription-quota handling (usage/changedwindows and Limited turns) that prompted this sync.How it's fixed
Merge-only sync of
upstream/main(c274a251) into the fork, followed by a merge of the fork's currentmain(PRs #42, #44, #43 landed during this work). 258 conflicted files, resolved toward keeping fork behaviors — multi-repository work folder flows, J4 identity andj4codeCLI, custom RPC methods, desktop metadata, and fork protocol version 1002 — on the new upstream APIs. Upstream migration 64 (CanonicalizeThreadPullRequestLinks) is appended as fork migration 70, after the fork's recorded ids through 69. The fork's older migration-history guard is dropped in favor of upstream's scopedassertV2MigrationsCanRun. Two follow-up commits adapt fork code to upstream API changes (Claude additional directories, queue-resume composer action, PR glyph constants) and to upstream's new lint rules (manual-memo removals in fork web files, regenerated mobile compiler bailout list).This brings in
packages/provider-muse/src/server/usageLimits.ts: Meta Muse turns stopped by the subscription quota are now Limited with a reset time, and Muse quota windows are tracked. The historical Usage page still does not list Muse — neither branch has that yet.Verification
Focused checks only (CI owns the full suite):
tsc-rs --noEmitpasses for server, web, mobile, desktop, contracts, client-runtime, shared, and the provider packages.vp lint: 0 errors across the merged areas (pre-existing warnings remain).usageLimits(4 tests, 100 in the package), migrations (whole manifest, 055, 070, reconcile, fork-upstream upgrade), server batches (Claude adapter, vcs, auth, mcp, usage, storage cleanup — 1,200+ tests), web pull-request/logic batches (764 tests via unit+browser projects), mobile state + React Compiler coverage (893 tests), desktop identity/CLI/Clerk, and desktop build-artifact scripts./varsymlink vs/private/varin storage-cleanup and Pi usage paths) pass with a non-symlinkedTMPDIR; one upstream mobile test (composer-attachment-uploads,__DEV__undefined) fails identically on pureupstream/mainin this environment. Neither is a merge regression.Done with Muse Code (muse-wonder-full-1.0) through the Muse harness.