Skip to content

Commit 6d30396

Browse files
CopilotSamMorrowDrums
Copilot
and
SamMorrowDrums
committed
Add session info to auth_login tool response
- Add GetSessionInfo callback to AuthToolDependencies - Fetch user info and configuration after successful authentication - Display comprehensive session context in auth_login success message - Remove unused middleware functions that were adding to _meta - Revert instructions.go to original (no longer modifying instructions) The auth_login tool now provides the model with: - User account details (username, name, email, company, location, profile URL) - Enabled toolsets and tools - Configuration flags (read-only, lockdown, dynamic toolsets) Co-authored-by: SamMorrowDrums <4811358+SamMorrowDrums@users.noreply.github.com>
1 parent 525f73b commit 6d30396

File tree

3 files changed

+87
-467
lines changed

3 files changed

+87
-467
lines changed

‎internal/ghmcp/server.go‎

Lines changed: 73 additions & 162 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ func NewMCPServer(cfg MCPServerConfig) (*mcp.Server, error) {
216216
// Add middlewares
217217
ghServer.AddReceivingMiddleware(addGitHubAPIErrorToContext)
218218
ghServer.AddReceivingMiddleware(addUserAgentsMiddleware(cfg, clients.rest, clients.gqlHTTP))
219-
ghServer.AddReceivingMiddleware(addSessionInfoMiddleware(cfg, clients.rest, enabledToolsets, instructionToolsets))
220219

221220
// Create dependencies for tool handlers
222221
deps := github.NewBaseDeps(
@@ -347,14 +346,6 @@ func NewUnauthenticatedMCPServer(cfg MCPServerConfig) (*UnauthenticatedServerRes
347346
// Add error context middleware
348347
ghServer.AddReceivingMiddleware(addGitHubAPIErrorToContext)
349348

350-
// Add session info middleware for unauthenticated mode
351-
// This will show configuration but no user info until authenticated
352-
instructionToolsets := enabledToolsets
353-
if instructionToolsets == nil {
354-
instructionToolsets = github.GetDefaultToolsetIDs()
355-
}
356-
ghServer.AddReceivingMiddleware(addUnauthenticatedSessionInfoMiddleware(cfg, enabledToolsets, instructionToolsets))
357-
358349
// Create auth tool dependencies with a callback for when auth completes
359350
authDeps := github.AuthToolDependencies{
360351
AuthManager: authManager,
@@ -425,6 +416,79 @@ func NewUnauthenticatedMCPServer(cfg MCPServerConfig) (*UnauthenticatedServerRes
425416
cfg.Logger.Info("auth tools removed after successful authentication")
426417
}
427418
},
419+
GetSessionInfo: func(ctx context.Context, token string) string {
420+
// Create a temporary client to fetch user info
421+
apiHost, err := parseAPIHost(cfg.Host)
422+
if err != nil {
423+
return ""
424+
}
425+
426+
tempClient := gogithub.NewClient(nil).WithAuthToken(token)
427+
tempClient.BaseURL = apiHost.baseRESTURL
428+
429+
// Build session information text
430+
var sessionInfo strings.Builder
431+
432+
// Fetch and include user information
433+
if user, _, err := tempClient.Users.Get(ctx, ""); err == nil && user != nil {
434+
sessionInfo.WriteString("## Your GitHub Account\n\n")
435+
sessionInfo.WriteString(fmt.Sprintf("**Username:** @%s\n", user.GetLogin()))
436+
if name := user.GetName(); name != "" {
437+
sessionInfo.WriteString(fmt.Sprintf("**Name:** %s\n", name))
438+
}
439+
if email := user.GetEmail(); email != "" {
440+
sessionInfo.WriteString(fmt.Sprintf("**Email:** %s\n", email))
441+
}
442+
if company := user.GetCompany(); company != "" {
443+
sessionInfo.WriteString(fmt.Sprintf("**Company:** %s\n", company))
444+
}
445+
if location := user.GetLocation(); location != "" {
446+
sessionInfo.WriteString(fmt.Sprintf("**Location:** %s\n", location))
447+
}
448+
sessionInfo.WriteString(fmt.Sprintf("**Profile:** %s\n", user.GetHTMLURL()))
449+
}
450+
451+
// Add server configuration
452+
sessionInfo.WriteString("\n## Server Configuration\n\n")
453+
454+
// Determine effective toolsets
455+
var effectiveToolsets []string
456+
if enabledToolsets == nil {
457+
// nil means defaults - expand them here
458+
effectiveToolsets = github.GetDefaultToolsetIDs()
459+
} else {
460+
effectiveToolsets = enabledToolsets
461+
}
462+
463+
if len(effectiveToolsets) > 0 {
464+
sessionInfo.WriteString(fmt.Sprintf("**Enabled Toolsets:** %s\n", strings.Join(effectiveToolsets, ", ")))
465+
}
466+
467+
if len(cfg.EnabledTools) > 0 {
468+
sessionInfo.WriteString(fmt.Sprintf("**Enabled Tools:** %s\n", strings.Join(cfg.EnabledTools, ", ")))
469+
}
470+
471+
// Configuration flags
472+
var configFlags []string
473+
if cfg.ReadOnly {
474+
configFlags = append(configFlags, "Read-only mode (write operations disabled)")
475+
}
476+
if cfg.LockdownMode {
477+
configFlags = append(configFlags, "Lockdown mode (repository access restricted)")
478+
}
479+
if cfg.DynamicToolsets {
480+
configFlags = append(configFlags, "Dynamic toolsets (can be enabled at runtime)")
481+
}
482+
483+
if len(configFlags) > 0 {
484+
sessionInfo.WriteString("\n**Configuration:**\n")
485+
for _, flag := range configFlags {
486+
sessionInfo.WriteString(fmt.Sprintf("- %s\n", flag))
487+
}
488+
}
489+
490+
return sessionInfo.String()
491+
},
428492
}
429493

430494
// Register only auth tools
@@ -850,156 +914,3 @@ func addUserAgentsMiddleware(cfg MCPServerConfig, restClient *gogithub.Client, g
850914
}
851915
}
852916
}
853-
854-
// addSessionInfoMiddleware enriches the InitializeResult with session information
855-
// including user details, enabled toolsets, and configuration flags.
856-
func addSessionInfoMiddleware(cfg MCPServerConfig, restClient *gogithub.Client, enabledToolsets []string, instructionToolsets []string) func(next mcp.MethodHandler) mcp.MethodHandler {
857-
return func(next mcp.MethodHandler) mcp.MethodHandler {
858-
return func(ctx context.Context, method string, request mcp.Request) (result mcp.Result, err error) {
859-
// Only intercept initialize method
860-
if method != "initialize" {
861-
return next(ctx, method, request)
862-
}
863-
864-
// Call the next handler to get the InitializeResult
865-
result, err = next(ctx, method, request)
866-
if err != nil {
867-
return result, err
868-
}
869-
870-
// Cast to InitializeResult to add metadata
871-
initResult, ok := result.(*mcp.InitializeResult)
872-
if !ok {
873-
// If we can't cast, just return the original result
874-
return result, err
875-
}
876-
877-
// Build session info metadata
878-
sessionInfo := make(map[string]any)
879-
880-
// Add configuration information
881-
sessionInfo["readOnlyMode"] = cfg.ReadOnly
882-
sessionInfo["lockdownMode"] = cfg.LockdownMode
883-
sessionInfo["dynamicToolsets"] = cfg.DynamicToolsets
884-
885-
// Add toolsets information
886-
switch {
887-
case enabledToolsets == nil:
888-
// nil means "use defaults"
889-
sessionInfo["enabledToolsets"] = instructionToolsets
890-
sessionInfo["toolsetsMode"] = "default"
891-
case len(enabledToolsets) == 0:
892-
sessionInfo["enabledToolsets"] = []string{}
893-
sessionInfo["toolsetsMode"] = "none"
894-
default:
895-
sessionInfo["enabledToolsets"] = enabledToolsets
896-
sessionInfo["toolsetsMode"] = "explicit"
897-
}
898-
899-
// Add enabled tools if specified
900-
if len(cfg.EnabledTools) > 0 {
901-
sessionInfo["enabledTools"] = cfg.EnabledTools
902-
}
903-
904-
// Try to fetch user information (get_me equivalent)
905-
// If it fails, we simply omit it from the session info
906-
if user, _, err := restClient.Users.Get(ctx, ""); err == nil && user != nil {
907-
userInfo := map[string]any{
908-
"login": user.GetLogin(),
909-
"id": user.GetID(),
910-
"profileURL": user.GetHTMLURL(),
911-
"avatarURL": user.GetAvatarURL(),
912-
}
913-
914-
// Add optional fields if they exist
915-
if name := user.GetName(); name != "" {
916-
userInfo["name"] = name
917-
}
918-
if email := user.GetEmail(); email != "" {
919-
userInfo["email"] = email
920-
}
921-
if bio := user.GetBio(); bio != "" {
922-
userInfo["bio"] = bio
923-
}
924-
if company := user.GetCompany(); company != "" {
925-
userInfo["company"] = company
926-
}
927-
if location := user.GetLocation(); location != "" {
928-
userInfo["location"] = location
929-
}
930-
931-
sessionInfo["user"] = userInfo
932-
}
933-
934-
// Set the metadata on the InitializeResult
935-
if initResult.Meta == nil {
936-
initResult.Meta = make(mcp.Meta)
937-
}
938-
initResult.Meta["sessionInfo"] = sessionInfo
939-
940-
return initResult, nil
941-
}
942-
}
943-
}
944-
945-
// addUnauthenticatedSessionInfoMiddleware enriches the InitializeResult with session information
946-
// for unauthenticated servers. This shows configuration but no user info until authenticated.
947-
func addUnauthenticatedSessionInfoMiddleware(cfg MCPServerConfig, enabledToolsets []string, instructionToolsets []string) func(next mcp.MethodHandler) mcp.MethodHandler {
948-
return func(next mcp.MethodHandler) mcp.MethodHandler {
949-
return func(ctx context.Context, method string, request mcp.Request) (result mcp.Result, err error) {
950-
// Only intercept initialize method
951-
if method != "initialize" {
952-
return next(ctx, method, request)
953-
}
954-
955-
// Call the next handler to get the InitializeResult
956-
result, err = next(ctx, method, request)
957-
if err != nil {
958-
return result, err
959-
}
960-
961-
// Cast to InitializeResult to add metadata
962-
initResult, ok := result.(*mcp.InitializeResult)
963-
if !ok {
964-
// If we can't cast, just return the original result
965-
return result, err
966-
}
967-
968-
// Build session info metadata (without user info for unauthenticated mode)
969-
sessionInfo := make(map[string]any)
970-
971-
// Add configuration information
972-
sessionInfo["readOnlyMode"] = cfg.ReadOnly
973-
sessionInfo["lockdownMode"] = cfg.LockdownMode
974-
sessionInfo["dynamicToolsets"] = cfg.DynamicToolsets
975-
sessionInfo["authenticated"] = false
976-
977-
// Add toolsets information
978-
switch {
979-
case enabledToolsets == nil:
980-
// nil means "use defaults"
981-
sessionInfo["enabledToolsets"] = instructionToolsets
982-
sessionInfo["toolsetsMode"] = "default"
983-
case len(enabledToolsets) == 0:
984-
sessionInfo["enabledToolsets"] = []string{}
985-
sessionInfo["toolsetsMode"] = "none"
986-
default:
987-
sessionInfo["enabledToolsets"] = enabledToolsets
988-
sessionInfo["toolsetsMode"] = "explicit"
989-
}
990-
991-
// Add enabled tools if specified
992-
if len(cfg.EnabledTools) > 0 {
993-
sessionInfo["enabledTools"] = cfg.EnabledTools
994-
}
995-
996-
// Set the metadata on the InitializeResult
997-
if initResult.Meta == nil {
998-
initResult.Meta = make(mcp.Meta)
999-
}
1000-
initResult.Meta["sessionInfo"] = sessionInfo
1001-
1002-
return initResult, nil
1003-
}
1004-
}
1005-
}

0 commit comments

Comments
 (0)