fix: restore compatibility after SDK migration

Author: debidong

go.mod

@@ -4,7 +4,7 @@ go 1.24.4
 
 require (
 	github.com/bluele/gcache v0.0.2
-	github.com/flashcatcloud/flashduty-sdk v0.3.0
+	github.com/flashcatcloud/flashduty-sdk v0.3.1-0.20260408101253-bbe0d25ae134
 	github.com/google/go-github/v72 v72.0.0
 	github.com/josephburnett/jd v1.9.2
 	github.com/mark3labs/mcp-go v0.45.0

go.sum

@@ -10,8 +10,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/flashcatcloud/flashduty-sdk v0.3.0 h1:jx7j6o+wFDIjTQaP5NtxWoAYIq6qtmIOQCZtG9OueV8=
-github.com/flashcatcloud/flashduty-sdk v0.3.0/go.mod h1:dG4eJfdZaj4jNBMwEexbfK/3PmcIMhNeJ88L/DcZzUY=
+github.com/flashcatcloud/flashduty-sdk v0.3.1-0.20260408101253-bbe0d25ae134 h1:QksBXCEjCub9p6na9qqWABTne3oNyV3vVlKZ/lw5qic=
+github.com/flashcatcloud/flashduty-sdk v0.3.1-0.20260408101253-bbe0d25ae134/go.mod h1:dG4eJfdZaj4jNBMwEexbfK/3PmcIMhNeJ88L/DcZzUY=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=

internal/flashduty/server.go

@@ -147,6 +147,14 @@ func NewMCPServer(cfg FlashdutyConfig) (*server.MCPServer, error) {
 	return flashdutyServer, nil
 }
 
+func newStreamableHTTPServer(mcpServer *server.MCPServer, logger *slog.Logger, contextFunc server.HTTPContextFunc) *server.StreamableHTTPServer {
+	return server.NewStreamableHTTPServer(
+		mcpServer,
+		server.WithLogger(&slogAdapter{logger: logger}),
+		server.WithHTTPContextFunc(contextFunc),
+	)
+}
+
 type StdioServerConfig struct {
 	// Version of the server
 	Version string
@@ -339,29 +347,21 @@ func RunHTTPServer(cfg HTTPServerConfig) error {
 		return fmt.Errorf("failed to create MCP server: %w", err)
 	}
 
-	httpServer := server.NewStreamableHTTPServer(
-		mcpServer,
-		server.WithLogger(&slogAdapter{logger: logger}),
-		// Return 405 for GET requests — this server doesn't use server-initiated
-		// features (sampling, elicitation). Without this, the SDK's standalone SSE
-		// GET hangs indefinitely because mcp-go creates an orphan session and blocks.
-		server.WithDisableStreaming(true),
-		server.WithHTTPContextFunc(func(ctx context.Context, r *http.Request) context.Context {
-			// Extract W3C Trace Context from HTTP headers, or generate a new one
-			traceCtx, err := trace.FromHTTPHeadersOrNew(r.Header)
-			if err != nil {
-				logger.Warn("Failed to generate trace context, continuing without trace", "error", err)
-				// Continue without trace context if generation fails
-			} else {
-				ctx = trace.ContextWithTraceContext(ctx, traceCtx)
-			}
-
-			// Note: HTTP request logging is handled by MCP hooks (OnBeforeAny, OnSuccess, OnError)
-			// which provide more detailed information including method, params, and results.
-
-			return httpContextFunc(ctx, r, cfg.BaseURL)
-		}),
-	)
+	httpServer := newStreamableHTTPServer(mcpServer, logger, func(ctx context.Context, r *http.Request) context.Context {
+		// Extract W3C Trace Context from HTTP headers, or generate a new one
+		traceCtx, err := trace.FromHTTPHeadersOrNew(r.Header)
+		if err != nil {
+			logger.Warn("Failed to generate trace context, continuing without trace", "error", err)
+			// Continue without trace context if generation fails
+		} else {
+			ctx = trace.ContextWithTraceContext(ctx, traceCtx)
+		}
+
+		// Note: HTTP request logging is handled by MCP hooks (OnBeforeAny, OnSuccess, OnError)
+		// which provide more detailed information including method, params, and results.
+
+		return httpContextFunc(ctx, r, cfg.BaseURL)
+	})
 
 	mux := http.NewServeMux()
 	mux.Handle("/mcp", httpServer)

internal/flashduty/server_test.go

@@ -0,0 +1,41 @@
+package flashduty
+
+import (
+	"context"
+	"io"
+	"log/slog"
+	"net/http"
+	"reflect"
+	"testing"
+
+	"github.com/flashcatcloud/flashduty-mcp-server/pkg/translations"
+)
+
+func TestNewStreamableHTTPServer_DoesNotDisableStreaming(t *testing.T) {
+	t.Parallel()
+
+	mcpServer, err := NewMCPServer(FlashdutyConfig{
+		Version:         "test",
+		Translator:      translations.NullTranslationHelper,
+		EnabledToolsets: []string{"incidents"},
+	})
+	if err != nil {
+		t.Fatalf("failed to create MCP server: %v", err)
+	}
+
+	httpServer := newStreamableHTTPServer(
+		mcpServer,
+		slog.New(slog.NewTextHandler(io.Discard, nil)),
+		func(ctx context.Context, _ *http.Request) context.Context {
+			return ctx
+		},
+	)
+
+	value := reflect.ValueOf(httpServer).Elem().FieldByName("disableStreaming")
+	if !value.IsValid() {
+		t.Fatal("expected streamable HTTP server to expose disableStreaming field")
+	}
+	if value.Bool() {
+		t.Fatal("expected streaming to remain enabled for GET/SSE clients")
+	}
+}

pkg/flashduty/templates.go

@@ -3,6 +3,7 @@ package flashduty
 import (
 	"context"
 	"fmt"
+	"slices"
 
 	sdk "github.com/flashcatcloud/flashduty-sdk"
 	"github.com/mark3labs/mcp-go/mcp"
@@ -15,6 +16,12 @@ import (
 
 const getPresetTemplateDescription = `Fetch the preset (default) notification template for a specific channel. Returns the Go template code used as the starting point for customization.`
 
+func sortedChannelEnumValues() []string {
+	channels := append([]string(nil), sdk.ChannelEnumValues()...)
+	slices.Sort(channels)
+	return channels
+}
+
 // GetPresetTemplate creates a tool to fetch the preset template for a channel.
 func GetPresetTemplate(getClient GetFlashdutyClientFn, t translations.TranslationHelperFunc) (tool mcp.Tool, handler server.ToolHandlerFunc) {
 	return mcp.NewTool("get_preset_template",
@@ -26,11 +33,7 @@ func GetPresetTemplate(getClient GetFlashdutyClientFn, t translations.Translatio
 			mcp.WithString("channel",
 				mcp.Required(),
 				mcp.Description("The notification channel to get the preset template for."),
-				mcp.Enum(sdk.ChannelEnumValues()...),
-			),
-			mcp.WithString("locale",
-				mcp.Description("Locale for the preset template. Defaults to zh-CN."),
-				mcp.Enum("zh-CN", "en-US"),
+				mcp.Enum(sortedChannelEnumValues()...),
 			),
 		), func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 			ctx, client, err := getClient(ctx)
@@ -43,14 +46,8 @@ func GetPresetTemplate(getClient GetFlashdutyClientFn, t translations.Translatio
 				return mcp.NewToolResultError(err.Error()), nil
 			}
 
-			locale, _ := OptionalParam[string](request, "locale")
-			if locale == "" {
-				locale = "zh-CN"
-			}
-
 			input := &sdk.GetPresetTemplateInput{
 				Channel: channel,
-				Locale:  locale,
 			}
 
 			output, err := client.GetPresetTemplate(ctx, input)
@@ -77,7 +74,7 @@ func ValidateTemplate(getClient GetFlashdutyClientFn, t translations.Translation
 			mcp.WithString("channel",
 				mcp.Required(),
 				mcp.Description("The notification channel this template is for."),
-				mcp.Enum(sdk.ChannelEnumValues()...),
+				mcp.Enum(sortedChannelEnumValues()...),
 			),
 			mcp.WithString("template_code",
 				mcp.Required(),

pkg/flashduty/templates_test.go

@@ -0,0 +1,58 @@
+package flashduty
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+
+	"github.com/flashcatcloud/flashduty-mcp-server/pkg/translations"
+	sdk "github.com/flashcatcloud/flashduty-sdk"
+)
+
+func TestGetPresetTemplateSchemaDoesNotExposeLocale(t *testing.T) {
+	t.Parallel()
+
+	tool, _ := GetPresetTemplate(func(ctx context.Context) (context.Context, *sdk.Client, error) {
+		return ctx, nil, nil
+	}, translations.NullTranslationHelper)
+
+	raw, err := json.Marshal(tool)
+	if err != nil {
+		t.Fatalf("marshal tool: %v", err)
+	}
+
+	var payload map[string]any
+	if err := json.Unmarshal(raw, &payload); err != nil {
+		t.Fatalf("unmarshal tool: %v", err)
+	}
+
+	schema, ok := payload["inputSchema"].(map[string]any)
+	if !ok {
+		t.Fatalf("expected inputSchema object, got %#v", payload["inputSchema"])
+	}
+	props, ok := schema["properties"].(map[string]any)
+	if !ok {
+		t.Fatalf("expected properties object, got %#v", schema["properties"])
+	}
+	if _, ok := props["locale"]; ok {
+		t.Fatal("expected locale to be absent from get_preset_template schema")
+	}
+
+	channelSchema, ok := props["channel"].(map[string]any)
+	if !ok {
+		t.Fatalf("expected channel schema, got %#v", props["channel"])
+	}
+	enumVals, ok := channelSchema["enum"].([]any)
+	if !ok {
+		t.Fatalf("expected channel enum values, got %#v", channelSchema["enum"])
+	}
+	want := sortedChannelEnumValues()
+	if len(enumVals) != len(want) {
+		t.Fatalf("expected %d channel enum values, got %d", len(want), len(enumVals))
+	}
+	for i, got := range enumVals {
+		if got.(string) != want[i] {
+			t.Fatalf("channel enum[%d] = %q, want %q", i, got.(string), want[i])
+		}
+	}
+}

pkg/flashduty/users.go

@@ -110,6 +110,13 @@ func QueryTeams(getClient GetFlashdutyClientFn, t translations.TranslationHelper
 				return mcp.NewToolResultError(fmt.Sprintf("Unable to retrieve teams: %v", err)), nil
 			}
 
+			// Preserve the historical direct-lookup shape for team_ids queries.
+			if len(input.TeamIDs) > 0 {
+				return MarshalResult(map[string]any{
+					"items": output.Teams,
+				}), nil
+			}
+
 			return MarshalResult(map[string]any{
 				"teams": output.Teams,
 				"total": output.Total,

pkg/flashduty/users_test.go

@@ -0,0 +1,77 @@
+package flashduty
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	sdk "github.com/flashcatcloud/flashduty-sdk"
+	"github.com/mark3labs/mcp-go/mcp"
+
+	"github.com/flashcatcloud/flashduty-mcp-server/pkg/translations"
+)
+
+func TestQueryTeamsByIDsPreservesLegacyItemsShape(t *testing.T) {
+	t.Parallel()
+
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != "/team/infos" {
+			t.Fatalf("unexpected path: %s", r.URL.Path)
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_ = json.NewEncoder(w).Encode(map[string]any{
+			"data": map[string]any{
+				"items": []any{
+					map[string]any{
+						"team_id":   101,
+						"team_name": "alpha",
+					},
+				},
+			},
+		})
+	}))
+	defer ts.Close()
+
+	client, err := sdk.NewClient("test-key", sdk.WithBaseURL(ts.URL))
+	if err != nil {
+		t.Fatalf("new sdk client: %v", err)
+	}
+
+	_, handler := QueryTeams(func(ctx context.Context) (context.Context, *sdk.Client, error) {
+		return ctx, client, nil
+	}, translations.NullTranslationHelper)
+
+	result, err := handler(context.Background(), mcp.CallToolRequest{
+		Params: mcp.CallToolParams{
+			Name: "query_teams",
+			Arguments: map[string]any{
+				"team_ids": "101",
+			},
+		},
+	})
+	if err != nil {
+		t.Fatalf("handler returned error: %v", err)
+	}
+	if result.IsError {
+		t.Fatalf("expected success result, got error result: %#v", result)
+	}
+
+	textContent, ok := mcp.AsTextContent(result.Content[0])
+	if !ok {
+		t.Fatalf("expected text content, got %#v", result.Content[0])
+	}
+
+	var payload map[string]any
+	if err := json.Unmarshal([]byte(textContent.Text), &payload); err != nil {
+		t.Fatalf("unmarshal payload: %v", err)
+	}
+
+	if _, ok := payload["items"]; !ok {
+		t.Fatalf("expected legacy items key, got %#v", payload)
+	}
+	if _, ok := payload["teams"]; ok {
+		t.Fatalf("did not expect teams key for team_ids lookup, got %#v", payload)
+	}
+}