Repository navigation
Commit ec5d8e1
chore: replace main's tree with v2
Phase 4 of the v2 go-live runbook (#1804 §5). `main` becomes the v2 tree while
keeping its own history: this is a true merge recording `v2/main` as a second
parent, not a reset, so no force-push is needed and the default branch's
history and PR trail survive intact.
Mechanically: `-s ours` to take no tree from the merge, then the index is
replaced wholesale with `v2/main`'s. `git diff HEAD origin/v2/main` is empty
afterwards.
Note the runbook's command needed one addition — `main` and `v2/main` have
genuinely unrelated histories (different root commits, no merge base), so
`--allow-unrelated-histories` is required or the merge refuses outright.
All 125 open PRs previously targeting `main` were re-pointed at `v1/main`
first, so none of them are stranded against a tree that no longer exists.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Txmv2qqv3yeKgRzoqXytzD1,221 files changed
Lines changed: 238981 additions & 47277 deletions
File tree
- .claude
- .github
- ISSUE_TEMPLATE
- workflows
- .husky
- clients
- cli
- __tests__
- helpers
- src
- handlers
- utils
- launcher
- __tests__
- scripts
- src
- tui
- __tests__
- helpers
- src
- components
- hooks
- utils
- web
- .storybook
- public
- server
- src
- components
- elements
- AnnotationBadge
- AppRenderer
- CapabilityItem
- CategoryBadge
- ClearButton
- CodeHighlight
- ConnectionToggle
- ContentViewer
- CopyButton
- CopyrightBadge
- EmbeddableScrollArea
- EraBadge
- ExpandToggle
- FilterToggleButton
- ListChangedIndicator
- ListPaginationControls
- ListToggle
- LogEntry
- LogLevelBadge
- McpErrorBadge
- MessageBubble
- MessageDirectionBadge
- MethodBadge
- MonitoringToggle
- MrtrOriginNote
- PinToggle
- ProgressDisplay
- ReplayButton
- ResizeHandle
- ResourceLinkInfo
- ScreenStage
- ServerStatusIndicator
- SortToggle
- SubscribeButton
- SubscriptionStreamBadge
- TaskStatusBadge
- TransportBadge
- VersionBadge
- groups
- AppControls
- AppDetailPanel
- AppListItem
- ClientSettingsForm
- ClientSettingsModal
- ConnectionInfoContent
- ConnectionInfoModal
- ElicitationFormPanel
- ElicitationUrlPanel
- ExperimentalFeaturesPanel
- ImportServerJsonPanel
- InlineElicitationRequest
- InlineSamplingRequest
- LogControls
- LogStreamPanel
- MessageDirectionFilter
- MonitoringControls
- MonitoringScreen
- MrtrConversation
- NetworkControls
- NetworkEntry
- NetworkStreamPanel
- OutputValidationModal
- PendingClientRequestModal
- PendingClientRequests
- PromptArgumentsForm
- PromptControls
- PromptListItem
- PromptMessagesDisplay
- ProtocolControls
- ProtocolEntry
- ProtocolListPanel
- ReAuthBanner
- ResourceControls
- ResourceLink
- ResourceListItem
- ResourcePreviewPanel
- ResourceSubscribedItem
- ResourceTemplatePanel
- RootsTable
- SamplingRequestPanel
- SchemaForm
- ServerAddMenu
- ServerCard
- ServerConfigModal
- ServerImportConfigModal
- ServerImportJsonModal
- ServerListControls
- ServerRemoveConfirmModal
- ServerSettingsForm
- ServerSettingsModal
- SortableServerCard
- StepUpAuthModal
- TaskCard
- TaskControls
- TaskListPanel
- ToolControls
- ToolDetailPanel
- ToolListItem
- ToolResultPanel
- UrlElicitationErrorModal
- ViewHeader
- screens
- AppsScreen
- ConsoleScreen
- LoggingScreen
- NetworkScreen
- PromptsScreen
- ProtocolScreen
- ResourcesScreen
- ServerListScreen
- TasksScreen
- ToolsScreen
- views/InspectorView
- hooks
- lib
- test
- core
- auth
- ema
- client
- logging
- mcp
- node
- remote
- state
- node
- react
- storage
- fixtures
- integration
- auth
- node
- helpers
- mcp
- import
- node
- remote
- node
- server
- storage
- theme
- assets
- types
- utils
- static
- client
- bin
- e2e
- src
- __mocks__
- __tests__
- components
- __tests__
- ui
- lib
- __tests__
- hooks
- __tests__
- utils
- __tests__
- cli
- __tests__
- helpers
- scripts
- src
- client
- core
- auth
- browser
- ema
- node
- remote
- client
- json
- logging
- mcp
- __tests__
- import
- node
- remote
- node
- state
- node
- react
- storage
- docs
- images
- scripts
- lib
- server
- src
- static
- specification
- diagrams
- screenshots
- test-servers
- configs
- src
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
2 | 6 | | |
3 | | - | |
| 7 | + | |
4 | 8 | | |
5 | | - | |
| 9 | + | |
6 | 10 | | |
7 | | - | |
| 11 | + | |
| 12 | + | |
8 | 13 | | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
14 | 20 | | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
21 | 26 | | |
22 | | - | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
23 | 34 | | |
24 | 35 | | |
25 | | - | |
26 | | - | |
27 | | - | |
| 36 | + | |
| 37 | + | |
28 | 38 | | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
| |||
Whitespace-only changes.
This file was deleted.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
This file was deleted.
This file was deleted.
0 commit comments