Skip to content

MCP part 3: adding, enabling and removing a server in Settings #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shanforge wants to merge 4 commits into from
Open

MCP part 3: adding, enabling and removing a server in Settings #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
826ab19
feat(mcp): adding, enabling, editing and removing a server in Settings
shanforge Sep 4, 2026
aebbe8a
fix: what the first review round found in the Settings screen
shanforge Sep 4, 2026
69fe5c1
fix: what the second review round found
shanforge Sep 4, 2026
5cd4694
fix: name the row a control belongs to
shanforge Sep 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Logue.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@
4DFBBF9A94D043AEAE9573D1 /* SpaceFolderWriteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F13A88F235D33A5674EC6CB /* SpaceFolderWriteTests.swift */; };
4E544BEADC120DA66F931B07 /* MarkdownTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB6607FD58EE7074846C4DC /* MarkdownTextView.swift */; };
4E5B9AA44205F22A4A113782 /* Suggestion.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8106A5A4786A5595D00CBF2 /* Suggestion.swift */; };
4E71028643800BB98A439F98 /* MCPRenameMigration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E5888F5EAA0144BB535EDF2 /* MCPRenameMigration.swift */; };
4E90B4EE5AB06A18C7B15717 /* RichTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = F86FEEACED36C11C79D2FA9A /* RichTextEditor.swift */; };
4E983F1CDE3D00085362D3EB /* DeepResearchCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00DB2AA9BA4A263B0524840D /* DeepResearchCoordinator.swift */; };
4EC81490F679629FBCC10192 /* MeetingBreakdownCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 756E8155CF5415154F8B2C49 /* MeetingBreakdownCard.swift */; };
Expand Down Expand Up @@ -304,6 +305,7 @@
606610B68EE510849B9358C3 /* MeetingWorkspaceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6B117D634010EECE1C83553 /* MeetingWorkspaceView.swift */; };
606932D135B847FCE58B9666 /* ShortcutRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96FBFFF1C777A33CD084240C /* ShortcutRow.swift */; };
60B8C522415BE5A837354AE4 /* InputDialogTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2CEF58FA0555995987FD7AE /* InputDialogTools.swift */; };
613D7C325B26DC43F4CD0955 /* MCPRenameMigrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64125C31BA8CDB08ADD703FA /* MCPRenameMigrationTests.swift */; };
620F4FDE41C2DA66A77D420F /* TaskInspectorPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 112B70D4C5B4DF51BEFCFB36 /* TaskInspectorPanel.swift */; };
62C5D528384197C6CA17422E /* MenuBarIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A0C424F1DB1CBE83620E9768 /* MenuBarIcon@2x.png */; };
6373E69354AD314B2BA380F7 /* HomeCardShell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E5007DA0D26B354ACEDDE7D /* HomeCardShell.swift */; };
Expand All @@ -324,6 +326,7 @@
68523E427C1ECCA206B03149 /* ActionItemInboxPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C89FFFB8EFE6EDE3560E782 /* ActionItemInboxPanel.swift */; };
68A60F0021C2B996783F3F41 /* DocumentPropertyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB0075D6BBFD557576AAF966 /* DocumentPropertyTests.swift */; };
68E15F52C2575EED30F6D8AE /* TaskFileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3B356E5C7937D4D7600108E /* TaskFileTests.swift */; };
691B28ABDBEEA10FB184EB2E /* MCPNamespaceClash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72F9D97B1C46C433A8908CB6 /* MCPNamespaceClash.swift */; };
693843E5E8F7A5A45AAD99BA /* InlineDiagramView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2A85CBFCD11CDF2FB693F73 /* InlineDiagramView.swift */; };
697553876307B2C83EA86595 /* ReviewModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE44EB0DEEE58EA51F73402B /* ReviewModels.swift */; };
69B2689283C249CBE8252ADE /* IslandSurfaceModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E127468D8DFBEDBF111016 /* IslandSurfaceModifier.swift */; };
Expand Down Expand Up @@ -435,6 +438,7 @@
900D62D26E62CC1BD86F6152 /* AudioTimelineMixer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CCEAA072E5CE2EDA0828E14 /* AudioTimelineMixer.swift */; };
90CE4DBE3D79C429616DB00A /* AgentConversation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 160A71994367176C72C11277 /* AgentConversation.swift */; };
91504F26FF724A765B016AF2 /* whatsnew-wikilinks.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E1089CE3E964A5BC0545A8 /* whatsnew-wikilinks.png */; };
9179F7B5B38B3E68AB712CC5 /* MCPServersSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 407A90F8E61C4E0576B95ADD /* MCPServersSection.swift */; };
92251AAC9FFBCEA92E722619 /* AboutSettingsTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C618174E127839238F1ABD6 /* AboutSettingsTab.swift */; };
924E8B180D4472C8BA2AA086 /* TranscriptGutter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBE94A9DFEBB0FEE09DD1F2 /* TranscriptGutter.swift */; };
92ADFD50F966330CB6025480 /* PropertyValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FD91D8BED8E4CACE940391 /* PropertyValue.swift */; };
Expand Down Expand Up @@ -511,6 +515,7 @@
ACBD67F76F286A34F1A0E4CA /* DocumentWidthMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = A62566632EE8FA6DAD6713DB /* DocumentWidthMode.swift */; };
ACF6D6515BF5CB9F03B85496 /* QuickOpenPaletteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CABE8A04DD20F09B12BEDB15 /* QuickOpenPaletteView.swift */; };
AD07D0DCE8536510D087A05C /* TroubleshootingActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15DD5F0F004960A0D0B66E8B /* TroubleshootingActions.swift */; };
AE20DB2F67CD986E3DEEAC19 /* MCPNamespaceClashTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F475CCA42BE819BF19DD4FA4 /* MCPNamespaceClashTests.swift */; };
AE7BCB76D77404A8B71D119E /* PIIModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B9978579DD7A8D5743C9DB6 /* PIIModels.swift */; };
AF35E4BCA1244DFE4B983329 /* UndoToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFBC89D908FFD586D1C38ABF /* UndoToastView.swift */; };
AFCA039A58319E9F99A6A763 /* VerifyModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F31BC63173139D2C8BB0D1D /* VerifyModels.swift */; };
Expand Down Expand Up @@ -943,6 +948,7 @@
402D8E4447C9B7063ADE7358 /* IslandThreadTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IslandThreadTests.swift; sourceTree = "<group>"; };
40381D10206F56D057943756 /* SpaceContentPane.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpaceContentPane.swift; sourceTree = "<group>"; };
4066081DEC2821193FE7D882 /* WikiLinkURLTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WikiLinkURLTests.swift; sourceTree = "<group>"; };
407A90F8E61C4E0576B95ADD /* MCPServersSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MCPServersSection.swift; sourceTree = "<group>"; };
417436A70F2C0F1DDA347DC4 /* AttachmentIntake.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentIntake.swift; sourceTree = "<group>"; };
41C0416ED8CE675F6EF78FA0 /* TaskStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskStoreTests.swift; sourceTree = "<group>"; };
42BFEBF99163808EE4126279 /* HomeContextBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeContextBar.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1039,6 +1045,7 @@
6405B6178237C69E2674D9E9 /* SystemAudioArmingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemAudioArmingTests.swift; sourceTree = "<group>"; };
640842B5780506F6C1A32F84 /* MarkdownStorageReenableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkdownStorageReenableTests.swift; sourceTree = "<group>"; };
6410A54BE5400DAAFADA2A88 /* SharedPolishComponents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedPolishComponents.swift; sourceTree = "<group>"; };
64125C31BA8CDB08ADD703FA /* MCPRenameMigrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MCPRenameMigrationTests.swift; sourceTree = "<group>"; };
6430E324276EBE1BD45A48BD /* PromptRegistry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromptRegistry.swift; sourceTree = "<group>"; };
6445D0008F16B2DFE083F469 /* CommandCenterRecordingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandCenterRecordingView.swift; sourceTree = "<group>"; };
64EBF5DF74CDD38CF0672831 /* SaveSummaryToDocumentSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SaveSummaryToDocumentSheet.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1081,6 +1088,7 @@
71CCC37048141456C9BA5AA3 /* DocumentSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentSearchBar.swift; sourceTree = "<group>"; };
7250A0C394AFABC041C58D68 /* DeepResearchCoordinator+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DeepResearchCoordinator+Helpers.swift"; sourceTree = "<group>"; };
72EE330160AA0276B2907F2A /* MeetingRowCompact.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingRowCompact.swift; sourceTree = "<group>"; };
72F9D97B1C46C433A8908CB6 /* MCPNamespaceClash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MCPNamespaceClash.swift; sourceTree = "<group>"; };
7390A75F79EE786998273DA7 /* IslandMotion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IslandMotion.swift; sourceTree = "<group>"; };
739A71E158624FCF8E71C075 /* PostRecordingPipeline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostRecordingPipeline.swift; sourceTree = "<group>"; };
73A0577F01A5B33292317D52 /* SummaryNarrationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SummaryNarrationService.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1169,6 +1177,7 @@
8DC85DAE7DF132DD4B355F61 /* PolishEngine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PolishEngine.swift; sourceTree = "<group>"; };
8DEC6591F262E1FB6400CA15 /* WritingNSTextView+SlashCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WritingNSTextView+SlashCommand.swift"; sourceTree = "<group>"; };
8E366631BFF6453332DAB21D /* TaskTextParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskTextParser.swift; sourceTree = "<group>"; };
8E5888F5EAA0144BB535EDF2 /* MCPRenameMigration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MCPRenameMigration.swift; sourceTree = "<group>"; };
8E65B9D58A6CC515006C9A20 /* FileSystemTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileSystemTools.swift; sourceTree = "<group>"; };
8EF14F906DB3DB326245738F /* AgentConversationStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgentConversationStore.swift; sourceTree = "<group>"; };
8F3E9AD232A1D6AEB3064E31 /* DiarizationManager+BatchASR.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DiarizationManager+BatchASR.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1461,6 +1470,7 @@
F26F4F42013205EAE3A14D9D /* HomeContinueGrid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeContinueGrid.swift; sourceTree = "<group>"; };
F30E821E71C80A341EEC3F68 /* BlockEditorView+Reorder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BlockEditorView+Reorder.swift"; sourceTree = "<group>"; };
F3BC206B7D135B2017B99C1D /* LinkIndexTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkIndexTests.swift; sourceTree = "<group>"; };
F475CCA42BE819BF19DD4FA4 /* MCPNamespaceClashTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MCPNamespaceClashTests.swift; sourceTree = "<group>"; };
F4837D7E60145F15B37A2310 /* GraphRetriever.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphRetriever.swift; sourceTree = "<group>"; };
F4D0B06CDDC1184FD7958F9A /* SuggestionCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuggestionCardView.swift; sourceTree = "<group>"; };
F520732BF6E86EA62DAC3E2B /* AgentTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgentTool.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1561,8 +1571,10 @@
children = (
7A0EC77C2B3E1C387145AC15 /* MCPCatalog.swift */,
4856F91CAEDD15EA6FD63DE3 /* MCPHTTPTransport.swift */,
72F9D97B1C46C433A8908CB6 /* MCPNamespaceClash.swift */,
786248368D126D5970BA120F /* MCPRegistryPlan.swift */,
B9815711174A0E38CAC49564 /* MCPRemoteTool.swift */,
8E5888F5EAA0144BB535EDF2 /* MCPRenameMigration.swift */,
398663A67F5AC2B88579ECCE /* MCPServer.swift */,
22DDE4BB103EE762B9193C67 /* MCPServerHealth.swift */,
78FA8D2FFCB71F613943E7C5 /* MCPServerStore.swift */,
Expand Down Expand Up @@ -1648,8 +1660,10 @@
640842B5780506F6C1A32F84 /* MarkdownStorageReenableTests.swift */,
216D7BAD368F51D5920D02E5 /* MCPFoundationsTests.swift */,
5650D423F2BE1586460EC7CD /* MCPInjectionTests.swift */,
F475CCA42BE819BF19DD4FA4 /* MCPNamespaceClashTests.swift */,
FA7C233F1363CFCDD985A945 /* MCPRegistryPlanTests.swift */,
83D720B453351470C9880F85 /* MCPRemoteToolTests.swift */,
64125C31BA8CDB08ADD703FA /* MCPRenameMigrationTests.swift */,
DE406D9272F3FF522E26024E /* MCPServerStoreTests.swift */,
E13D8E299A128DA50DCB2D95 /* MCPWireFormatTests.swift */,
88A1A4DAACB05EBD1C285AF9 /* MessageActionsTests.swift */,
Expand Down Expand Up @@ -1873,6 +1887,7 @@
ED83A7FADA1F871AEA2687DE /* BrowserExtensionSection.swift */,
344DDE65E3765B845016619D /* ExternalModelsSection.swift */,
3FF85EA0F9822CBD660E9AAB /* MarkdownStorageWarningSheet.swift */,
407A90F8E61C4E0576B95ADD /* MCPServersSection.swift */,
38B7C47637B8FBFF7CC83C4F /* NetworkEgressSection.swift */,
B57D98C9B0D1E6A69681C8C1 /* SettingsView.swift */,
);
Expand Down Expand Up @@ -2900,8 +2915,10 @@
C8E1AB4ED265C0B97465C5BD /* LongRecordingE2ETests.swift in Sources */,
6810260973C01161B9183B44 /* MCPFoundationsTests.swift in Sources */,
DC93BD43EA6E6F7471EDABFD /* MCPInjectionTests.swift in Sources */,
AE20DB2F67CD986E3DEEAC19 /* MCPNamespaceClashTests.swift in Sources */,
B4BD1DFE81C73B14923168E1 /* MCPRegistryPlanTests.swift in Sources */,
957B3BD059A37354FC76CD38 /* MCPRemoteToolTests.swift in Sources */,
613D7C325B26DC43F4CD0955 /* MCPRenameMigrationTests.swift in Sources */,
064E60464AEBFC09535CABB0 /* MCPServerStoreTests.swift in Sources */,
32F4E241050F113E21222AA8 /* MCPWireFormatTests.swift in Sources */,
A138EE66F6C6808592F6F945 /* MarkdownDocumentFileTests.swift in Sources */,
Expand Down Expand Up @@ -3248,11 +3265,14 @@
F03521AB1AD681F4D08060C3 /* LogueApp.swift in Sources */,
2944C84805092418E45892EA /* MCPCatalog.swift in Sources */,
4508AD94FB3EB3CF566D4FA9 /* MCPHTTPTransport.swift in Sources */,
691B28ABDBEEA10FB184EB2E /* MCPNamespaceClash.swift in Sources */,
94858FA8F83D9A3EA7A94BD0 /* MCPRegistryPlan.swift in Sources */,
E85CACB47187DC6493AB23A0 /* MCPRemoteTool.swift in Sources */,
4E71028643800BB98A439F98 /* MCPRenameMigration.swift in Sources */,
FEDA0911BF52241492E9AA51 /* MCPServer.swift in Sources */,
F596B64B4AD068E3645B5D70 /* MCPServerHealth.swift in Sources */,
CDEE0252F385F4C1BC4EA128 /* MCPServerStore.swift in Sources */,
9179F7B5B38B3E68AB712CC5 /* MCPServersSection.swift in Sources */,
6B6624468938CD6ADDA5781E /* MCPToolDescriptor.swift in Sources */,
43898343C424D0AAF75C9950 /* MCPToolNaming.swift in Sources */,
8749D7B4B33106238D10C12D /* MCPToolOutput.swift in Sources */,
Expand Down
8 changes: 8 additions & 0 deletions Logue/Agent/MCP/MCPCatalog.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@ final class MCPCatalog {
}
}
for await (id, result) in group {
// The server list is read again here, not only when the group was built. A
// refresh takes as long as the slowest server, and the user can remove one
// while it runs — `forget(id:)` would clear its entries and this loop would
// then write them straight back, for a server that no longer exists. Nothing
// would offer those tools, because `MCPRegistryPlan` walks the store, but
// they would be held for the rest of the session.
guard store.servers.contains(where: { $0.id == id }) else { continue }

switch result {
case let .success(descriptors):
discovered[id] = descriptors
Expand Down
30 changes: 30 additions & 0 deletions Logue/Agent/MCP/MCPNamespaceClash.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import Foundation

/// Whether a server's name would publish its tools under a prefix another server already has.
///
/// Namespaces are *derived* from names — that is what stops a server picking one that
/// shadows a built-in — and the derivation folds: `GitHub`, `git hub` and `GIT-HUB` all give
/// `git_hub`. Two servers landing on the same namespace publish the same names, and
/// `MCPRegistryPlan` resolves that by keeping the first and dropping the rest.
///
/// Which is the right resolution, and an invisible one. The second server sits in Settings
/// enabled, reachable, reporting its tool count — and offers the model nothing, with nothing
/// on screen saying why. So the clash is worth naming *before* it is created, which means
/// answering it while the user is still typing.
///
/// Pure, and outside the view, because a decision made inside a `View` is one the next caller
/// cannot reach — the same reason `AskRouter` is a function rather than a branch in a body.
enum MCPNamespaceClash {
/// The first of `existing` that folds to the same namespace as `candidate`.
///
/// - Parameters:
/// - candidate: the name being typed.
/// - existing: the names of the other servers — the caller excludes the one being
/// edited, because a server does not clash with itself.
static func first(for candidate: String, among existing: [String]) -> String? {
let trimmed = candidate.trimmingCharacters(in: .whitespaces)
guard !trimmed.isEmpty else { return nil }
let namespace = MCPToolNaming.namespace(for: trimmed)
return existing.first { MCPToolNaming.namespace(for: $0) == namespace }
}
}
Loading
Loading