added ui/no-ui support

Author: mattdholloway

pkg/github/issues.go

@@ -1086,7 +1086,7 @@ Options are:
 			},
 		},
 		[]scopes.Scope{scopes.Repo},
-		func(ctx context.Context, deps ToolDependencies, _ *mcp.CallToolRequest, args map[string]any) (*mcp.CallToolResult, any, error) {
+		func(ctx context.Context, deps ToolDependencies, req *mcp.CallToolRequest, args map[string]any) (*mcp.CallToolResult, any, error) {
 			method, err := RequiredParam[string](args, "method")
 			if err != nil {
 				return utils.NewToolResultError(err.Error()), nil, nil
@@ -1101,12 +1101,14 @@ Options are:
 				return utils.NewToolResultError(err.Error()), nil, nil
 			}
 
-			// When insiders mode is enabled, check if this is a UI form submission.
-			// The UI sends _ui_submitted=true to distinguish form submissions from LLM calls.
-			// Without this flag, always show the UI so the user can review/edit before submitting.
+			// When insiders mode is enabled and the client supports MCP Apps UI,
+			// check if this is a UI form submission. The UI sends _ui_submitted=true
+			// to distinguish form submissions from LLM calls. Without this flag,
+			// show the UI so the user can review/edit before submitting.
+			// Clients without MCP Apps support skip this gate and execute directly.
 			uiSubmitted, _ := OptionalParam[bool](args, "_ui_submitted")
 
-			if deps.GetFlags(ctx).InsidersMode && !uiSubmitted {
+			if deps.GetFlags(ctx).InsidersMode && clientSupportsUI(req) && !uiSubmitted {
 				if method == "update" {
 					issueNumber, numErr := RequiredInt(args, "issue_number")
 					if numErr != nil {

pkg/github/issues_test.go

@@ -933,6 +933,50 @@ func Test_CreateIssue(t *testing.T) {
 	}
 }
 
+// Test_IssueWrite_InsidersMode_NoUISupport verifies that when insiders mode is
+// enabled but the client does not support MCP Apps UI (no session or no UI
+// capability), the tool executes directly instead of returning a "Ready to..."
+// form message.
+func Test_IssueWrite_InsidersMode_NoUISupport(t *testing.T) {
+	t.Parallel()
+
+	mockIssue := &github.Issue{
+		Number:  github.Ptr(1),
+		Title:   github.Ptr("Test"),
+		HTMLURL: github.Ptr("https://github.com/owner/repo/issues/1"),
+	}
+
+	serverTool := IssueWrite(translations.NullTranslationHelper)
+
+	client := github.NewClient(MockHTTPClientWithHandlers(map[string]http.HandlerFunc{
+		PostReposIssuesByOwnerByRepo: mockResponse(t, http.StatusCreated, mockIssue),
+	}))
+
+	deps := BaseDeps{
+		Client:    client,
+		GQLClient: githubv4.NewClient(nil),
+		Flags:     FeatureFlags{InsidersMode: true},
+	}
+	handler := serverTool.Handler(deps)
+
+	// Request has no session — simulates a client without MCP Apps support
+	request := createMCPRequest(map[string]interface{}{
+		"method": "create",
+		"owner":  "owner",
+		"repo":   "repo",
+		"title":  "Test",
+	})
+	result, err := handler(ContextWithDeps(context.Background(), deps), &request)
+	require.NoError(t, err)
+	require.NotNil(t, result)
+
+	textContent := getTextResult(t, result)
+	assert.NotContains(t, textContent.Text, "interactive form will be displayed",
+		"tool should execute directly when client has no MCP Apps support")
+	assert.Contains(t, textContent.Text, "https://github.com/owner/repo/issues/1",
+		"tool should return the created issue URL")
+}
+
 func Test_ListIssues(t *testing.T) {
 	// Verify tool definition
 	serverTool := ListIssues(translations.NullTranslationHelper)

pkg/github/pullrequests.go

@@ -545,7 +545,7 @@ func CreatePullRequest(t translations.TranslationHelperFunc) inventory.ServerToo
 			},
 		},
 		[]scopes.Scope{scopes.Repo},
-		func(ctx context.Context, deps ToolDependencies, _ *mcp.CallToolRequest, args map[string]any) (*mcp.CallToolResult, any, error) {
+		func(ctx context.Context, deps ToolDependencies, req *mcp.CallToolRequest, args map[string]any) (*mcp.CallToolResult, any, error) {
 			owner, err := RequiredParam[string](args, "owner")
 			if err != nil {
 				return utils.NewToolResultError(err.Error()), nil, nil
@@ -555,11 +555,13 @@ func CreatePullRequest(t translations.TranslationHelperFunc) inventory.ServerToo
 				return utils.NewToolResultError(err.Error()), nil, nil
 			}
 
-			// When insiders mode is enabled, check if this is a UI form submission.
-			// The UI sends _ui_submitted=true to distinguish form submissions from LLM calls.
+			// When insiders mode is enabled and the client supports MCP Apps UI,
+			// check if this is a UI form submission. The UI sends _ui_submitted=true
+			// to distinguish form submissions from LLM calls.
+			// Clients without MCP Apps support skip this gate and execute directly.
 			uiSubmitted, _ := OptionalParam[bool](args, "_ui_submitted")
 
-			if deps.GetFlags(ctx).InsidersMode && !uiSubmitted {
+			if deps.GetFlags(ctx).InsidersMode && clientSupportsUI(req) && !uiSubmitted {
 				return utils.NewToolResultText(fmt.Sprintf("Ready to create a pull request in %s/%s. The interactive form will be displayed.", owner, repo)), nil, nil
 			}
 

pkg/github/pullrequests_test.go

@@ -2172,6 +2172,53 @@ func Test_CreatePullRequest(t *testing.T) {
 	}
 }
 
+// Test_CreatePullRequest_InsidersMode_NoUISupport verifies that when insiders
+// mode is enabled but the client does not support MCP Apps UI, the tool
+// executes directly instead of returning a "Ready to..." form message.
+func Test_CreatePullRequest_InsidersMode_NoUISupport(t *testing.T) {
+	t.Parallel()
+
+	mockPR := &github.PullRequest{
+		Number:  github.Ptr(42),
+		Title:   github.Ptr("Test PR"),
+		HTMLURL: github.Ptr("https://github.com/owner/repo/pull/42"),
+		Head:    &github.PullRequestBranch{SHA: github.Ptr("abc"), Ref: github.Ptr("feature")},
+		Base:    &github.PullRequestBranch{SHA: github.Ptr("def"), Ref: github.Ptr("main")},
+		User:    &github.User{Login: github.Ptr("testuser")},
+	}
+
+	serverTool := CreatePullRequest(translations.NullTranslationHelper)
+
+	client := github.NewClient(MockHTTPClientWithHandlers(map[string]http.HandlerFunc{
+		PostReposPullsByOwnerByRepo: mockResponse(t, http.StatusCreated, mockPR),
+	}))
+
+	deps := BaseDeps{
+		Client:    client,
+		GQLClient: githubv4.NewClient(nil),
+		Flags:     FeatureFlags{InsidersMode: true},
+	}
+	handler := serverTool.Handler(deps)
+
+	// Request has no session — simulates a client without MCP Apps support
+	request := createMCPRequest(map[string]interface{}{
+		"owner": "owner",
+		"repo":  "repo",
+		"title": "Test PR",
+		"head":  "feature",
+		"base":  "main",
+	})
+	result, err := handler(ContextWithDeps(context.Background(), deps), &request)
+	require.NoError(t, err)
+	require.NotNil(t, result)
+
+	textContent := getTextResult(t, result)
+	assert.NotContains(t, textContent.Text, "interactive form will be displayed",
+		"tool should execute directly when client has no MCP Apps support")
+	assert.Contains(t, textContent.Text, "https://github.com/owner/repo/pull/42",
+		"tool should return the created PR URL")
+}
+
 func TestCreateAndSubmitPullRequestReview(t *testing.T) {
 	t.Parallel()
 

pkg/github/ui_capability.go

@@ -0,0 +1,26 @@
+package github
+
+import "github.com/modelcontextprotocol/go-sdk/mcp"
+
+// UIExtensionID is the MCP Apps extension identifier used for capability negotiation.
+// Clients advertise MCP Apps support by including this key in their capabilities.
+// See: https://github.com/modelcontextprotocol/ext-apps
+const UIExtensionID = "io.modelcontextprotocol/ui"
+
+// clientSupportsUI checks whether the client that sent this request supports
+// MCP Apps UI rendering. It inspects the client's experimental capabilities
+// for the MCP Apps extension identifier.
+//
+// When the client does not support MCP Apps, tools should skip any UI-gated
+// flow (e.g., interactive forms) and execute the action directly.
+func clientSupportsUI(req *mcp.CallToolRequest) bool {
+	if req == nil || req.Session == nil {
+		return false
+	}
+	params := req.Session.InitializeParams()
+	if params == nil || params.Capabilities == nil {
+		return false
+	}
+	_, ok := params.Capabilities.Experimental[UIExtensionID]
+	return ok
+}

pkg/github/ui_capability_test.go

@@ -0,0 +1,36 @@
+package github
+
+import (
+	"testing"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestClientSupportsUI(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name     string
+		req      *mcp.CallToolRequest
+		expected bool
+	}{
+		{
+			name:     "nil request",
+			req:      nil,
+			expected: false,
+		},
+		{
+			name:     "nil session",
+			req:      &mcp.CallToolRequest{},
+			expected: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+			assert.Equal(t, tt.expected, clientSupportsUI(tt.req))
+		})
+	}
+}