add create pull request functionality with UI support and insiders

Author: mattdholloway

internal/ghmcp/server.go

@@ -115,6 +115,51 @@ func NewStdioMCPServer(ctx context.Context, cfg github.MCPServerConfig) (*mcp.Se
 	// Create feature checker
 	featureChecker := createFeatureChecker(cfg.EnabledFeatures)
 
+	// Build and register the tool/resource/prompt inventory
+	inventoryBuilder := github.NewInventory(cfg.Translator).
+		WithDeprecatedAliases(github.DeprecatedToolAliases).
+		WithReadOnly(cfg.ReadOnly).
+		WithToolsets(enabledToolsets).
+		WithTools(cfg.EnabledTools).
+		WithFeatureChecker(featureChecker).
+		WithInsidersMode(cfg.InsidersMode).
+		WithServerInstructions()
+
+	// Apply token scope filtering if scopes are known (for PAT filtering)
+	if cfg.TokenScopes != nil {
+		inventoryBuilder = inventoryBuilder.WithFilter(github.CreateToolScopeFilter(cfg.TokenScopes))
+	}
+
+	inventory, err := inventoryBuilder.Build()
+	if err != nil {
+		return nil, fmt.Errorf("failed to build inventory: %w", err)
+	}
+
+	// Create the MCP server
+	serverOpts := &mcp.ServerOptions{
+		Instructions: inventory.Instructions(),
+		Logger:       cfg.Logger,
+		CompletionHandler: github.CompletionsHandler(func(_ context.Context) (*gogithub.Client, error) {
+			return clients.rest, nil
+		}),
+	}
+
+	// In dynamic mode, explicitly advertise capabilities since tools/resources/prompts
+	// may be enabled at runtime even if none are registered initially.
+	if cfg.DynamicToolsets {
+		serverOpts.Capabilities = &mcp.ServerCapabilities{
+			Tools:     &mcp.ToolCapabilities{},
+			Resources: &mcp.ResourceCapabilities{},
+			Prompts:   &mcp.PromptCapabilities{},
+		}
+	}
+
+	ghServer := github.NewServer(cfg.Version, serverOpts)
+
+	// Add middlewares
+	ghServer.AddReceivingMiddleware(addGitHubAPIErrorToContext)
+	ghServer.AddReceivingMiddleware(addUserAgentsMiddleware(cfg, clients.rest, clients.gqlHTTP))
+
 	// Create dependencies for tool handlers
 	deps := github.NewBaseDeps(
 		clients.rest,
@@ -143,9 +188,21 @@ func NewStdioMCPServer(ctx context.Context, cfg github.MCPServerConfig) (*mcp.Se
 		inventoryBuilder = inventoryBuilder.WithFilter(github.CreateToolScopeFilter(cfg.TokenScopes))
 	}
 
-	inventory, err := inventoryBuilder.Build()
-	if err != nil {
-		return nil, fmt.Errorf("failed to build inventory: %w", err)
+	// Register GitHub tools/resources/prompts from the inventory.
+	// In dynamic mode with no explicit toolsets, this is a no-op since enabledToolsets
+	// is empty - users enable toolsets at runtime via the dynamic tools below (but can
+	// enable toolsets or tools explicitly that do need registration).
+	inventory.RegisterAll(context.Background(), ghServer, deps)
+
+	// Register MCP App UI resources (static resources for tool UI) - insiders only
+	if cfg.InsidersMode {
+		github.RegisterUIResources(ghServer)
+	}
+
+	// Register dynamic toolset management tools (enable/disable) - these are separate
+	// meta-tools that control the inventory, not part of the inventory itself
+	if cfg.DynamicToolsets {
+		registerDynamicTools(ghServer, inventory, deps, cfg.Translator)
 	}
 
 	ghServer, err := github.NewMCPServer(ctx, &cfg, deps, inventory)

pkg/github/__toolsnaps__/create_pull_request.snap

@@ -1,8 +1,17 @@
 {
+  "_meta": {
+    "ui": {
+      "resourceUri": "ui://github-mcp-server/pr-write",
+      "visibility": [
+        "model",
+        "app"
+      ]
+    }
+  },
   "annotations": {
     "title": "Open new pull request"
   },
-  "description": "Create a new pull request in a GitHub repository.",
+  "description": "Create a new pull request in a GitHub repository.\n\nWhen show_ui is true, an interactive form is displayed for the user to fill in PR details. Use show_ui when:\n- Creating a new PR and you want user input on the details\n- The user hasn't specified all required fields (title, head, base, etc.)\n- Interactive feedback would be valuable (branch selection, reviewers, labels)\n\nWhen show_ui is false or omitted, the PR is created directly with the provided parameters.",
   "inputSchema": {
     "properties": {
       "base": {
@@ -33,17 +42,18 @@
         "description": "Repository name",
         "type": "string"
       },
+      "show_ui": {
+        "description": "If true, show an interactive form for the user to fill in PR details. If false or omitted, create the PR directly with the provided parameters.",
+        "type": "boolean"
+      },
       "title": {
         "description": "PR title",
         "type": "string"
       }
     },
     "required": [
       "owner",
-      "repo",
-      "title",
-      "head",
-      "base"
+      "repo"
     ],
     "type": "object"
   },

pkg/github/__toolsnaps__/issue_write.snap

@@ -61,7 +61,7 @@
         "type": "string"
       },
       "show_ui": {
-        "description": "If true, show an interactive form for the user to fill in issue details. If false or omitted, create/update the issue directly with the provided parameters. Use show_ui when you want user input or when not all fields are specified.",
+        "description": "If true, show an interactive form for the user to fill in issue details. If false or omitted, create/update the issue directly with the provided parameters.",
         "type": "boolean"
       },
       "state": {

pkg/github/context_tools.go

@@ -54,6 +54,11 @@ func GetMe(t translations.TranslationHelperFunc) inventory.ServerTool {
 			// Use json.RawMessage to ensure "properties" is included even when empty.
 			// OpenAI strict mode requires the properties field to be present.
 			InputSchema: json.RawMessage(`{"type":"object","properties":{}}`),
+			Meta: mcp.Meta{
+				"ui": map[string]any{
+					"resourceUri": GetMeUIResourceURI,
+				},
+			},
 		},
 		nil,
 		func(ctx context.Context, deps ToolDependencies, _ *mcp.CallToolRequest, _ map[string]any) (*mcp.CallToolResult, any, error) {

pkg/github/issues.go

@@ -1190,7 +1190,6 @@ When show_ui is false or omitted, the issue is created/updated directly with the
 				Title:        t("TOOL_ISSUE_WRITE_USER_TITLE", "Create or update issue."),
 				ReadOnlyHint: false,
 			},
-			// MCP Apps UI metadata - links this tool to its UI resource
 			Meta: mcp.Meta{
 				"ui": map[string]any{
 					"resourceUri": IssueWriteUIResourceURI,
@@ -1202,7 +1201,7 @@ When show_ui is false or omitted, the issue is created/updated directly with the
 				Properties: map[string]*jsonschema.Schema{
 					"show_ui": {
 						Type:        "boolean",
-						Description: "If true, show an interactive form for the user to fill in issue details. If false or omitted, create/update the issue directly with the provided parameters. Use show_ui when you want user input or when not all fields are specified.",
+						Description: "If true, show an interactive form for the user to fill in issue details. If false or omitted, create/update the issue directly with the provided parameters.",
 					},
 					"method": {
 						Type: "string",
@@ -1295,9 +1294,9 @@ Options are:
 				return utils.NewToolResultError(err.Error()), nil, nil
 			}
 
-			// If show_ui is true, return a message indicating the UI should be shown
+			// If show_ui is true and insiders mode is enabled, return a message indicating the UI should be shown
 			// The host will detect the UI metadata and display the form
-			if showUI {
+			if showUI && deps.GetFlags().InsidersMode {
 				if method == "update" {
 					issueNumber, numErr := RequiredInt(args, "issue_number")
 					if numErr != nil {

pkg/github/pullrequests.go

@@ -485,57 +485,75 @@ func GetPullRequestReviews(ctx context.Context, client *github.Client, deps Tool
 	return utils.NewToolResultText(string(r)), nil
 }
 
+// PullRequestWriteUIResourceURI is the URI for the create_pull_request tool's MCP App UI resource.
+const PullRequestWriteUIResourceURI = "ui://github-mcp-server/pr-write"
+
 // CreatePullRequest creates a tool to create a new pull request.
 func CreatePullRequest(t translations.TranslationHelperFunc) inventory.ServerTool {
-	schema := &jsonschema.Schema{
-		Type: "object",
-		Properties: map[string]*jsonschema.Schema{
-			"owner": {
-				Type:        "string",
-				Description: "Repository owner",
-			},
-			"repo": {
-				Type:        "string",
-				Description: "Repository name",
-			},
-			"title": {
-				Type:        "string",
-				Description: "PR title",
-			},
-			"body": {
-				Type:        "string",
-				Description: "PR description",
-			},
-			"head": {
-				Type:        "string",
-				Description: "Branch containing changes",
-			},
-			"base": {
-				Type:        "string",
-				Description: "Branch to merge into",
-			},
-			"draft": {
-				Type:        "boolean",
-				Description: "Create as draft PR",
-			},
-			"maintainer_can_modify": {
-				Type:        "boolean",
-				Description: "Allow maintainer edits",
-			},
-		},
-		Required: []string{"owner", "repo", "title", "head", "base"},
-	}
-
 	return NewTool(
 		ToolsetMetadataPullRequests,
 		mcp.Tool{
-			Name:        "create_pull_request",
-			Description: t("TOOL_CREATE_PULL_REQUEST_DESCRIPTION", "Create a new pull request in a GitHub repository."),
+			Name: "create_pull_request",
+			Description: t("TOOL_CREATE_PULL_REQUEST_DESCRIPTION", `Create a new pull request in a GitHub repository.
+
+When show_ui is true, an interactive form is displayed for the user to fill in PR details. Use show_ui when:
+- Creating a new PR and you want user input on the details
+- The user hasn't specified all required fields (title, head, base, etc.)
+- Interactive feedback would be valuable (branch selection, reviewers, labels)
+
+When show_ui is false or omitted, the PR is created directly with the provided parameters.`),
 			Annotations: &mcp.ToolAnnotations{
 				Title:        t("TOOL_CREATE_PULL_REQUEST_USER_TITLE", "Open new pull request"),
 				ReadOnlyHint: false,
 			},
-			InputSchema: schema,
+			Meta: mcp.Meta{
+				"ui": map[string]any{
+					"resourceUri": PullRequestWriteUIResourceURI,
+					"visibility":  []string{"model", "app"},
+				},
+			},
+			InputSchema: &jsonschema.Schema{
+				Type: "object",
+				Properties: map[string]*jsonschema.Schema{
+					"show_ui": {
+						Type:        "boolean",
+						Description: "If true, show an interactive form for the user to fill in PR details. If false or omitted, create the PR directly with the provided parameters.",
+					},
+					"owner": {
+						Type:        "string",
+						Description: "Repository owner",
+					},
+					"repo": {
+						Type:        "string",
+						Description: "Repository name",
+					},
+					"title": {
+						Type:        "string",
+						Description: "PR title",
+					},
+					"body": {
+						Type:        "string",
+						Description: "PR description",
+					},
+					"head": {
+						Type:        "string",
+						Description: "Branch containing changes",
+					},
+					"base": {
+						Type:        "string",
+						Description: "Branch to merge into",
+					},
+					"draft": {
+						Type:        "boolean",
+						Description: "Create as draft PR",
+					},
+					"maintainer_can_modify": {
+						Type:        "boolean",
+						Description: "Allow maintainer edits",
+					},
+				},
+				Required: []string{"owner", "repo"},
+			},
 		},
 		[]scopes.Scope{scopes.Repo},
 		func(ctx context.Context, deps ToolDependencies, _ *mcp.CallToolRequest, args map[string]any) (*mcp.CallToolResult, any, error) {
@@ -547,6 +565,19 @@ func CreatePullRequest(t translations.TranslationHelperFunc) inventory.ServerToo
 			if err != nil {
 				return utils.NewToolResultError(err.Error()), nil, nil
 			}
+
+			// Check if UI mode is requested
+			showUI, err := OptionalParam[bool](args, "show_ui")
+			if err != nil {
+				return utils.NewToolResultError(err.Error()), nil, nil
+			}
+
+			// If show_ui is true and insiders mode is enabled, return a message indicating the UI should be shown
+			if showUI && deps.GetFlags().InsidersMode {
+				return utils.NewToolResultText(fmt.Sprintf("Ready to create a pull request in %s/%s. The interactive form will be displayed.", owner, repo)), nil, nil
+			}
+
+			// When not using UI, title/head/base are required
 			title, err := RequiredParam[string](args, "title")
 			if err != nil {
 				return utils.NewToolResultError(err.Error()), nil, nil

pkg/github/pullrequests_test.go

@@ -2031,6 +2031,7 @@ func Test_CreatePullRequest(t *testing.T) {
 	assert.Equal(t, "create_pull_request", tool.Name)
 	assert.NotEmpty(t, tool.Description)
 	schema := tool.InputSchema.(*jsonschema.Schema)
+	assert.Contains(t, schema.Properties, "show_ui")
 	assert.Contains(t, schema.Properties, "owner")
 	assert.Contains(t, schema.Properties, "repo")
 	assert.Contains(t, schema.Properties, "title")
@@ -2039,7 +2040,7 @@ func Test_CreatePullRequest(t *testing.T) {
 	assert.Contains(t, schema.Properties, "base")
 	assert.Contains(t, schema.Properties, "draft")
 	assert.Contains(t, schema.Properties, "maintainer_can_modify")
-	assert.ElementsMatch(t, schema.Required, []string{"owner", "repo", "title", "head", "base"})
+	assert.ElementsMatch(t, schema.Required, []string{"owner", "repo"})
 
 	// Setup mock PR for success case
 	mockPR := &github.PullRequest{

pkg/github/ui_resources.go

@@ -64,4 +64,26 @@ func RegisterUIResources(s *mcp.Server) {
 			}, nil
 		},
 	)
+
+	// Register the create_pull_request UI resource
+	s.AddResource(
+		&mcp.Resource{
+			URI:         PullRequestWriteUIResourceURI,
+			Name:        "pr_write_ui",
+			Description: "MCP App UI for creating GitHub pull requests",
+			MIMEType:    "text/html",
+		},
+		func(_ context.Context, _ *mcp.ReadResourceRequest) (*mcp.ReadResourceResult, error) {
+			html := MustGetUIAsset("pr-write.html")
+			return &mcp.ReadResourceResult{
+				Contents: []*mcp.ResourceContents{
+					{
+						URI:      PullRequestWriteUIResourceURI,
+						MIMEType: "text/html",
+						Text:     html,
+					},
+				},
+			}, nil
+		},
+	)
 }