Gate MCP tool calls from Claude Desktop Extensions

Author: RonCodes88

control-plane/internal/api/install.go

@@ -133,8 +133,8 @@ func buildPlanOps(req installPlanRequest) ([]fileOp, []string, []string) {
 		case "claude-code":
 			ops = append(ops, claudeCodePlan(req.DaemonURL, req.ConfigDirOverride, req.AgentlockBinary, req.StatusLineScript, req.HarnessConfigDirs, req.ExistingFiles))
 		case "claude-desktop":
-			op, ws := claudeDesktopPlan(req.DaemonURL, req.ConfigDirOverride, req.AgentlockBinary, req.HarnessConfigDirs, req.ExistingFiles)
-			ops = append(ops, op)
+			desktopOps, ws := claudeDesktopPlan(req.DaemonURL, req.ConfigDirOverride, req.AgentlockBinary, req.HarnessConfigDirs, req.ExistingFiles)
+			ops = append(ops, desktopOps...)
 			warnings = append(warnings, ws...)
 		case "codex":
 			codexOps, ws := codexPlan(req.DaemonURL, req.ConfigDirOverride, req.AgentlockBinary, req.HarnessConfigDirs, req.ExistingFiles)
@@ -481,7 +481,13 @@ func installApplyHandler(d Deps) http.HandlerFunc {
 func harnessForPath(path string) string {
 	dir := filepath.Base(filepath.Dir(path))
 	switch {
-	case strings.HasSuffix(path, "claude_desktop_config.json"):
+	case strings.HasSuffix(path, "claude_desktop_config.json"),
+		strings.HasSuffix(path, "extensions-installations.json"):
+		return "claude-desktop"
+	case strings.HasSuffix(path, "manifest.json") &&
+		strings.Contains(path, "/Claude Extensions/"):
+		// Bundle manifest of a Desktop Extension. Path shape:
+		// <config-dir>/Claude Extensions/<ext-id>/manifest.json.
 		return "claude-desktop"
 	case strings.HasSuffix(path, "settings.json"):
 		// Gemini also writes settings.json (in ~/.gemini); disambiguate
@@ -682,7 +688,18 @@ func installUninstallHandler(d Deps) http.HandlerFunc {
 			case "gemini":
 				newBytes, removed, stripErr = stripGeminiSettings(existing)
 			case "claude-desktop":
-				newBytes, removed, stripErr = stripClaudeDesktopConfig(existing)
+				// Three file shapes land here:
+				//   - claude_desktop_config.json (manual mcpServers path)
+				//   - extensions-installations.json (Desktop Extensions registry)
+				//   - <Claude Extensions>/<id>/manifest.json (bundle manifests, the actual launch source)
+				if strings.HasSuffix(e.SettingsPath, "extensions-installations.json") {
+					newBytes, removed, stripErr = stripExtensionRegistry(existing)
+				} else if strings.HasSuffix(e.SettingsPath, "manifest.json") &&
+					strings.Contains(e.SettingsPath, "/Claude Extensions/") {
+					newBytes, removed, stripErr = stripBundleManifest(existing)
+				} else {
+					newBytes, removed, stripErr = stripClaudeDesktopConfig(existing)
+				}
 			default:
 				// Default to Claude's settings.json shape. Older manifests
 				// without a Harness field land here, which is the right
@@ -890,26 +907,81 @@ func installUninstallHarnessesHandler(d Deps) http.HandlerFunc {
 				}
 				ops = append(ops, op)
 			case "claude-desktop":
-				p, err := claudeDesktopConfigPath(req.ConfigDirOverride, req.HarnessConfigDirs)
+				// Strip both files Claude Desktop install touches: the
+				// mcpServers config (claude_desktop_config.json) and
+				// the Desktop Extensions registry
+				// (extensions-installations.json). Each is independent
+				// — one can be missing without affecting the other.
+				cfgP, err := claudeDesktopConfigPath(req.ConfigDirOverride, req.HarnessConfigDirs)
 				if err != nil {
 					failures++
 					ops = append(ops, uninstallOp{Op: "strip", Path: "<unresolved>", Error: err.Error()})
-					continue
-				}
-				existing := []byte(req.ExistingFiles[p])
-				newBytes, removed, stripErr := stripClaudeDesktopConfig(existing)
-				op := uninstallOp{Op: "strip", Path: p}
-				if stripErr != nil {
-					failures++
-					op.Error = stripErr.Error()
-					log.Printf("install.uninstall_harnesses: strip claude-desktop %s: %v", p, stripErr)
 				} else {
-					op.EntriesRemoved = removed
-					if removed > 0 {
-						op.Content = string(newBytes)
+					cfgExisting := []byte(req.ExistingFiles[cfgP])
+					newBytes, removed, stripErr := stripClaudeDesktopConfig(cfgExisting)
+					op := uninstallOp{Op: "strip", Path: cfgP}
+					if stripErr != nil {
+						failures++
+						op.Error = stripErr.Error()
+						log.Printf("install.uninstall_harnesses: strip claude-desktop %s: %v", cfgP, stripErr)
+					} else {
+						op.EntriesRemoved = removed
+						if removed > 0 {
+							op.Content = string(newBytes)
+						}
+					}
+					ops = append(ops, op)
+				}
+				if regP, err := extensionsRegistryPath(req.ConfigDirOverride, req.HarnessConfigDirs); err == nil {
+					regExisting := []byte(req.ExistingFiles[regP])
+					if len(regExisting) > 0 {
+						newBytes, removed, stripErr := stripExtensionRegistry(regExisting)
+						op := uninstallOp{Op: "strip", Path: regP}
+						if stripErr != nil {
+							failures++
+							op.Error = stripErr.Error()
+							log.Printf("install.uninstall_harnesses: strip claude-desktop extensions %s: %v", regP, stripErr)
+						} else {
+							op.EntriesRemoved = removed
+							if removed > 0 {
+								op.Content = string(newBytes)
+							}
+						}
+						ops = append(ops, op)
+					}
+				}
+				// Strip every per-extension bundle manifest the CLI sent
+				// us. The on-disk manifest is THE launch source for
+				// Desktop Extensions (probed empirically) so this is
+				// what actually un-gates the user.
+				bundlesDir, _ := claudeDesktopExtensionsDir(req.ConfigDirOverride, req.HarnessConfigDirs)
+				if bundlesDir != "" {
+					absBundles := bundlesDir
+					if a, err := filepath.Abs(bundlesDir); err == nil {
+						absBundles = a
+					}
+					for path, body := range req.ExistingFiles {
+						if !strings.HasSuffix(path, "/manifest.json") {
+							continue
+						}
+						if filepath.Dir(filepath.Dir(path)) != absBundles {
+							continue
+						}
+						newBytes, removed, stripErr := stripBundleManifest([]byte(body))
+						op := uninstallOp{Op: "strip", Path: path}
+						if stripErr != nil {
+							failures++
+							op.Error = stripErr.Error()
+							log.Printf("install.uninstall_harnesses: strip claude-desktop bundle %s: %v", path, stripErr)
+						} else {
+							op.EntriesRemoved = removed
+							if removed > 0 {
+								op.Content = string(newBytes)
+							}
+						}
+						ops = append(ops, op)
 					}
 				}
-				ops = append(ops, op)
 			default:
 				if devHome == "" || !knownHarnessID(h) {
 					// No real installer + not in dev mode → nothing to do.