Repository navigation
Sync upstream 2026-11-02 - #40
Merged
Merged
Conversation
…n alias (pingdotgg#27859) Co-authored-by: maria-rcks <[email protected]>
Co-authored-by: Omar <[email protected]>
…s hanging (pingdotgg#27924) Co-authored-by: Trevor Edwards <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#27990) Co-authored-by: Claude Code (claude-opus-5-5) <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
…T3 runs (pingdotgg#28064) Co-authored-by: Claude Opus 5.5 <[email protected]>
…op (pingdotgg#28072) Co-authored-by: Claude Opus 5.5 <[email protected]>
…witches threads (pingdotgg#28091) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…tgg#28132) Co-authored-by: Claude Opus 5.5 <[email protected]>
…_capabilities reports (pingdotgg#28133) Co-authored-by: Claude Opus 5.5 <[email protected]>
…dotgg#28169) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ironment disabled (pingdotgg#28179) Co-authored-by: Claude Opus 5.5 <[email protected]>
…nks (pingdotgg#28189) Co-authored-by: MarcoDotIO <[email protected]>
…otgg#28209) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#28240) Co-authored-by: Claude Opus 5.5 <[email protected]>
…dotgg#28243) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
) Co-authored-by: Lukas Tomondy <[email protected]>
…ngdotgg#28267) Co-authored-by: Claude Opus 5.5 <[email protected]>
…otgg#28268) Co-authored-by: Claude Opus 5.5 <[email protected]>
…he app unreleased (pingdotgg#28269) Co-authored-by: Claude Opus 5.5 <[email protected]>
…rver test that reads it (pingdotgg#28273) Co-authored-by: Claude Opus 5.5 <[email protected]>
…dotgg#28274) Co-authored-by: Claude Opus 5.5 <[email protected]>
…unched T3 (pingdotgg#29169) Co-authored-by: Claude Opus 5.5 <[email protected]>
…dotgg#29348) Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
) Co-authored-by: Gabriel Rodrigues <[email protected]> Co-authored-by: Cursor <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…29465) Co-authored-by: Claude Opus 5.5 <[email protected]>
# Conflicts: # .github/workflows/ci.yml # apps/desktop/src/preview/BrowserImport/BrowserImport.test.ts # apps/desktop/src/preview/BrowserImport/BrowserImport.ts # apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.test.tsx # apps/mobile/src/features/settings/ThreadSettingsSections.tsx # apps/mobile/src/features/threads/ThreadDetailScreen.tsx # apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx # apps/mobile/src/lib/threadActivity.test.ts # apps/server/src/auth/McpOAuth.test.ts # apps/server/src/auth/RpcAuthorization.test.ts # apps/server/src/auth/http.test.ts # apps/server/src/cloud/bootService.ts # apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts # apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts # apps/server/src/orchestration-v2/CheckpointRollbackService.ts # apps/server/src/orchestration-v2/Orchestrator.ts # apps/server/src/orchestration-v2/ProjectCommands.ts # apps/server/src/orchestration-v2/ProjectStore.test.ts # apps/server/src/orchestration-v2/ProjectStore.ts # apps/server/src/orchestration-v2/ProjectionStore.ts # apps/server/src/orchestration-v2/ProviderTurnStartService.ts # apps/server/src/orchestration-v2/RuntimePolicy.test.ts # apps/server/src/orchestration-v2/runtimeLayer.ts # apps/server/src/project/AgentSessionImporter.test.ts # apps/server/src/project/AgentSessionImporter.ts # apps/server/src/project/AgentSessionScanner.ts # apps/server/src/project/ProjectMutation.ts # apps/server/src/project/ProjectService.ts # apps/server/src/provider/Drivers/ClaudeSkills.ts # apps/server/src/server.ts # apps/server/src/usage/cliproxyApi.test.ts # apps/server/src/ws.ts # apps/web/src/components/ChatView.logic.ts # apps/web/src/components/ChatView.tsx # apps/web/src/components/CommandPalette.tsx # apps/web/src/components/LegacySidebar.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/browserImport/BrowserImportWizard.tsx # apps/web/src/components/chat/DraftHeroHeadline.tsx # apps/web/src/components/chat/MessagesTimeline.logic.ts # apps/web/src/components/chat/ThreadDetailsPanel.tsx # apps/web/src/components/chat/TimelineUserMessageRow.tsx # apps/web/src/components/chat/useTimelineRewind.ts # apps/web/src/components/settings/IntegrationsSettings.logic.test.ts # apps/web/src/components/settings/IntegrationsSettings.tsx # apps/web/src/components/settings/ProjectSettingsPanel.browser.test.tsx # apps/web/src/components/settings/ProjectSettingsPanel.tsx # apps/web/src/components/settings/SettingInheritance.test.ts # apps/web/src/components/settings/SettingInheritance.tsx # apps/web/src/components/settings/SettingsPanels.tsx # apps/web/src/components/settings/browserImportWizard.logic.ts # apps/web/src/components/settings/settingsSearch.test.ts # apps/web/src/components/settings/settingsSearch.ts # apps/web/src/components/settings/useAvailableSettingsSearchItems.ts # apps/web/src/components/sidebar/SidebarListMarkers.tsx # apps/web/src/components/sidebar/SidebarThreadRow.tsx # apps/web/src/routes/_chat.index.tsx # apps/web/src/state/entities.ts # apps/web/src/uiStateStore.test.ts # apps/web/src/uiStateStore.ts # docs/user/composer.md # docs/user/thread-sidebar.md # packages/client-runtime/src/operations/commands.ts # packages/client-runtime/src/state/sharedSettings.test.ts # packages/client-runtime/src/state/sharedSettings.ts # packages/client-runtime/src/state/threadCommands.ts # packages/contracts/src/applicationEvent.ts # packages/contracts/src/clientRpcPermissions.ts # packages/contracts/src/orchestrationV2.ts # packages/contracts/src/project.ts # packages/contracts/src/rpc.ts # packages/contracts/src/settings.test.ts # packages/contracts/src/settings.ts # packages/provider-core/src/server/failure.ts # packages/tailscale/src/tailscale.ts
github-actions
Bot
added
vouch:trusted
Co-Authored-By: Claude Opus 5.5 <[email protected]>
…merge Drop our project-archive code now that upstream ships it (pingdotgg#26154), restore resolveSidebarV2TopStatus, rename the lint-disable rule, fix test layers. Co-Authored-By: Claude Opus 5.5 <[email protected]>
…ld test Co-Authored-By: Claude Opus 5.5 <[email protected]>
…nly route Upstream removed GET /api/auth/clients. Co-Authored-By: Claude Opus 5.5 <[email protected]>
Co-Authored-By: Claude Opus 5.5 <[email protected]>
…nner Co-Authored-By: Claude Opus 5.5 <[email protected]>
…on a database with archived_at Co-Authored-By: Claude Opus 5.5 <[email protected]>
…container Co-Authored-By: Claude Opus 5.5 <[email protected]>
…f at its exact row Co-Authored-By: Claude Opus 5.5 <[email protected]>
Upstream build-cli-archive.ts now bundles libatomic and runs patchelf on Linux. Co-Authored-By: Claude Opus 5.5 <[email protected]>
…ts again The upstream merge replaced useUnarchivedProjectsAndThreads with plain useProjects/useVisibleThreadShells in CommandPalette and DraftHeroHeadline, so threads of archived projects showed in Cmd+K and archived projects in the picker. The hook now builds on the visible (tag-filtered) shells and both screens call it. CUSTOM.md names both screens and gains its drop cell. Co-Authored-By: Claude Opus 5.5 <[email protected]>
The previous commit pointed the palette add-project path at the filtered project list, so an archived project was never found and the add failed with "Active project already exists". Keep unfiltered allProjects and allThreads for that path, as custom-v2 did, and filter only the lists. Co-Authored-By: Claude Opus 5.5 <[email protected]>
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
Merges the newest official T3 Code (upstream/main 8657eec, 1,205 new commits) into custom-v2. 77 files conflicted; upstream won, our features re-applied on top (see CUSTOM.md).
Dropped: "Archive projects" (upstream pingdotgg#26154 ships pin and archive). Migration 076 now adds its columns only when missing, so databases that ran our old helper still migrate.
Draft: pushed straight after the merge commit so CI runs early; lint and type fixes follow.
Merge Danger
Review fix (2026-11-02): the command palette and the new-thread picker hide archived projects again, and re-adding an archived folder restores it. Proved by: web typecheck, vp check (0 errors), palette tests 46/46, and a four-axis review plus two re-checks (0 blockers left).
🤖 Generated with Claude Code