fix(mcp): fix support for streamable http

cmd/scw/testdata/test-all-usage-mcp-server-list-resources-usage.golden

@@ -10,17 +10,17 @@ EXAMPLES:
     scw mcp server list-resources
 
   List resources for a specific namespace
-    scw mcp server list-resources namespace=instance
+    scw mcp server list-resources namespaces=instance
 
   List resources for a specific resource type
-    scw mcp server list-resources resource=server
+    scw mcp server list-resources resources=server
 
   List only read-only resources
     scw mcp server list-resources read-only=true
 
 ARGS:
-  [namespace]         Filter by namespace (e.g., instance, iam, object)
-  [resource]          Filter by resource (e.g., server, volume, bucket)
+  [namespaces]        Filter by namespaces (e.g., instance, iam, object)
+  [resources]         Filter by resources (e.g., server, volume, bucket)
   [read-only=false]   Only list read-only resources
 
 FLAGS:

cmd/scw/testdata/test-all-usage-mcp-server-list-tools-usage.golden

@@ -9,22 +9,22 @@ EXAMPLES:
   List all available MCP tools
     scw mcp server list-tools
 
-  List tools for a specific namespace
-    scw mcp server list-tools namespace=instance
+  List tools for specific namespaces (comma-separated)
+    scw mcp server list-tools namespaces=instance
 
-  List tools for a specific resource
-    scw mcp server list-tools resource=server
+  List tools for specific resources (comma-separated)
+    scw mcp server list-tools resources=server
 
   List only read-only tools (get/list operations)
     scw mcp server list-tools read-only=true
 
-  List tools with a specific verb
-    scw mcp server list-tools verb=get
+  List tools with specific verbs (comma-separated)
+    scw mcp server list-tools verbs=get,list
 
 ARGS:
-  [namespace]         Filter by namespace (e.g., instance, iam, object)
-  [resource]          Filter by resource (e.g., server, volume, bucket)
-  [verb]              Filter by verb (e.g., get, list, create)
+  [namespaces]        Filter by namespaces (e.g., instance, iam, object)
+  [resources]         Filter by resources (e.g., server, volume, bucket)
+  [verbs]             Filter by verbs (e.g., get, list, create)
   [read-only=false]   Only list read-only tools (get, list operations)
 
 FLAGS:

cmd/scw/testdata/test-all-usage-mcp-server-serve-usage.golden

@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟩🟩🟩 STDOUT️ 🟩🟩🟩️
-Runs the MCP server, exposing all CLI commands as MCP tools for AI assistants. Supports stdio (default), SSE, and streamable HTTP transports.
+Runs the MCP server, exposing all CLI commands as MCP tools for AI assistants. Supports stdio (default) and streamable HTTP transports.
 
 USAGE:
   scw mcp server serve [arg=value ...]
@@ -13,27 +13,24 @@ EXAMPLES:
     scw mcp server serve --read-only
 
   Only serve commands from specific namespaces
-    scw mcp server serve --enable-namespaces instance,iam,object
+    scw mcp server serve namespaces=instance,iam,object
 
   Only serve commands from specific resources
-    scw mcp server serve --enable-resources server,volume,bucket
+    scw mcp server serve resources=server,volume,bucket
 
   Only serve commands with specific verbs
-    scw mcp server serve --enable-verbs get,list,create
+    scw mcp server serve verbs=get,list,create
 
   Combine filters to serve only instance server get/list commands
-    scw mcp server serve --enable-namespaces instance --enable-resources server --enable-verbs get,list
-
-  Start the MCP server with SSE transport on port 8080
-    scw mcp server serve --transport sse --address :8080
+    scw mcp server serve namespaces=instance resources=server verbs=get,list
 
 ARGS:
-  [transport=stdio]     Transport mode: stdio (default), sse, or streamable-http
-  [address=:8080]       Address to bind for SSE and streamable-http transports (e.g., :8080)
-  [read-only=false]     Only register read-only commands (get, list operations)
-  [enable-namespaces]   Only serve commands from specified namespaces (comma-separated)
-  [enable-resources]    Only serve commands from specified resources (comma-separated)
-  [enable-verbs]        Only serve commands with specified verbs (comma-separated)
+  [transport=stdio]   Transport mode: stdio (default) or streamable-http
+  [address=:8080]     Address to bind for streamable-http transports (e.g., :8080)
+  [read-only=false]   Only register read-only commands (get, list operations)
+  [namespaces]        Only serve commands from specified namespaces (comma-separated)
+  [resources]         Only serve commands from specified resources (comma-separated)
+  [verbs]             Only serve commands with specified verbs (comma-separated)
 
 FLAGS:
   -h, --help                help for serve

core/checks.go

@@ -51,7 +51,7 @@ func CreateAndCloseFile(path string) error {
 // runAfterCommandChecks execute checks after a command has been executed
 // skipped if command has disabled checks or was executed in the last 24 hours
 func runAfterCommandChecks(ctx context.Context, checkFuncs ...AfterCommandCheckFunc) {
-	cmd := extractMeta(ctx).command
+	cmd := ExtractMeta(ctx).command
 	cmdDisableCheck := cmd != nil && cmd.DisableAfterChecks
 	if cmdDisableCheck {
 		ExtractLogger(ctx).Debug("skipping after command checks")

core/cobra_utils.go

@@ -20,7 +20,7 @@ func cobraRun(ctx context.Context, cmd *Command) func(*cobra.Command, []string)
 
 		rawArgs := args.RawArgs(rawArgsStr)
 
-		meta := extractMeta(ctx)
+		meta := ExtractMeta(ctx)
 		meta.command = cmd
 
 		// Check if --list-sub-commands flag is set

core/context.go

@@ -2,6 +2,7 @@ package core
 
 import (
 	"context"
+	"errors"
 	"io"
 	"net/http"
 	"os"
@@ -50,71 +51,121 @@ func InjectMeta(ctx context.Context, meta *Meta) context.Context {
 	return context.WithValue(ctx, metaContextKey, meta)
 }
 
-// extractMeta extracts Meta from a given context.
-func extractMeta(ctx context.Context) *Meta {
-	return ctx.Value(metaContextKey).(*Meta)
+// ExtractMeta extracts Meta from a given context.
+func ExtractMeta(ctx context.Context) *Meta {
+	if meta, ok := ctx.Value(metaContextKey).(*Meta); ok {
+		return meta
+	}
+
+	return nil
 }
 
 // injectSDKConfig add config to a Meta context
 func InjectConfig(ctx context.Context, config *scw.Config) {
-	extractMeta(ctx).Platform.SetScwConfig(config)
+	meta := ExtractMeta(ctx)
+	if meta != nil && meta.Platform != nil {
+		meta.Platform.SetScwConfig(config)
+	}
 }
 
 func extractConfig(ctx context.Context) *scw.Config {
-	m := extractMeta(ctx)
-	if m.Platform != nil {
+	m := ExtractMeta(ctx)
+	if m != nil && m.Platform != nil {
 		return m.Platform.ScwConfig()
 	}
 
 	return nil
 }
 
 func ExtractCommands(ctx context.Context) *Commands {
-	return extractMeta(ctx).Commands
+	meta := ExtractMeta(ctx)
+	if meta == nil {
+		return nil
+	}
+
+	return meta.Commands
 }
 
 func ExtractCliConfig(ctx context.Context) *cliConfig.Config {
-	return extractMeta(ctx).CliConfig
+	meta := ExtractMeta(ctx)
+	if meta == nil {
+		return nil
+	}
+
+	return meta.CliConfig
 }
 
 func ExtractAliases(ctx context.Context) *alias.Config {
-	return ExtractCliConfig(ctx).Alias
+	cliConfig := ExtractCliConfig(ctx)
+	if cliConfig == nil {
+		return nil
+	}
+
+	return cliConfig.Alias
 }
 
 func GetOrganizationIDFromContext(ctx context.Context) string {
 	client := ExtractClient(ctx)
+	if client == nil {
+		return ""
+	}
 	organizationID, _ := client.GetDefaultOrganizationID()
 
 	return organizationID
 }
 
 func GetProjectIDFromContext(ctx context.Context) string {
 	client := ExtractClient(ctx)
+	if client == nil {
+		return ""
+	}
 	projectID, _ := client.GetDefaultProjectID()
 
 	return projectID
 }
 
 func ExtractClient(ctx context.Context) *scw.Client {
-	return extractMeta(ctx).Client
+	meta := ExtractMeta(ctx)
+	if meta == nil {
+		return nil
+	}
+
+	return meta.Client
 }
 
 func ExtractLogger(ctx context.Context) *Logger {
-	return extractMeta(ctx).Logger
+	meta := ExtractMeta(ctx)
+	if meta == nil {
+		return nil
+	}
+
+	return meta.Logger
 }
 
 func ExtractBuildInfo(ctx context.Context) *BuildInfo {
-	return extractMeta(ctx).BuildInfo
+	meta := ExtractMeta(ctx)
+	if meta == nil {
+		return nil
+	}
+
+	return meta.BuildInfo
 }
 
 func ExtractBetaMode(ctx context.Context) bool {
-	return extractMeta(ctx).BetaMode
+	meta := ExtractMeta(ctx)
+	if meta == nil {
+		return false
+	}
+
+	return meta.BetaMode
 }
 
 func ExtractEnv(ctx context.Context, envKey string) string {
-	meta := extractMeta(ctx)
-	if value, exist := meta.OverrideEnv[envKey]; exist {
-		return value
+	meta := ExtractMeta(ctx)
+	if meta != nil {
+		if value, exist := meta.OverrideEnv[envKey]; exist {
+			return value
+		}
 	}
 
 	if envKey == "HOME" {
@@ -140,17 +191,28 @@ func ExtractCacheDir(ctx context.Context) string {
 }
 
 func ExtractBinaryName(ctx context.Context) string {
-	return extractMeta(ctx).BinaryName
+	meta := ExtractMeta(ctx)
+	if meta == nil {
+		return ""
+	}
+
+	return meta.BinaryName
 }
 
 func ExtractStdin(ctx context.Context) io.Reader {
-	return extractMeta(ctx).stdin
+	meta := ExtractMeta(ctx)
+	if meta == nil {
+		return nil
+	}
+
+	return meta.stdin
 }
 
 func ExtractProfileName(ctx context.Context) string {
+	meta := ExtractMeta(ctx)
 	// Handle profile flag -p
-	if extractMeta(ctx).ProfileFlag != "" {
-		return extractMeta(ctx).ProfileFlag
+	if meta != nil && meta.ProfileFlag != "" {
+		return meta.ProfileFlag
 	}
 
 	// Handle SCW_PROFILE env variable
@@ -170,13 +232,21 @@ func ExtractProfileName(ctx context.Context) string {
 }
 
 func ExtractHTTPClient(ctx context.Context) *http.Client {
-	return extractMeta(ctx).httpClient
+	meta := ExtractMeta(ctx)
+	if meta == nil {
+		return nil
+	}
+
+	return meta.httpClient
 }
 
 func ExtractConfigPath(ctx context.Context) string {
-	meta := extractMeta(ctx)
+	meta := ExtractMeta(ctx)
+	if meta == nil {
+		return scw.GetConfigPath()
+	}
 	if meta.ConfigPathFlag != "" {
-		return extractMeta(ctx).ConfigPathFlag
+		return meta.ConfigPathFlag
 	}
 	// This is only useful for test when we override home environment variable
 	if home := meta.OverrideEnv["HOME"]; home != "" {
@@ -187,7 +257,12 @@ func ExtractConfigPath(ctx context.Context) string {
 }
 
 func ExtractCliConfigPath(ctx context.Context) string {
-	meta := extractMeta(ctx)
+	meta := ExtractMeta(ctx)
+	if meta == nil {
+		configPath, _ := cliConfig.FilePath()
+
+		return configPath
+	}
 	// This is only useful for test when we override home environment variable
 	if home := meta.OverrideEnv["HOME"]; home != "" {
 		return path.Join(home, ".config", "scw", cliConfig.DefaultConfigFileName)
@@ -198,8 +273,11 @@ func ExtractCliConfigPath(ctx context.Context) string {
 }
 
 func ReloadClient(ctx context.Context) error {
+	meta := ExtractMeta(ctx)
+	if meta == nil {
+		return errors.New("cannot reload client: meta not found in context")
+	}
 	var err error
-	meta := extractMeta(ctx)
 	meta.Client, err = meta.Platform.CreateClient(
 		meta.httpClient,
 		ExtractConfigPath(ctx),
@@ -210,11 +288,21 @@ func ReloadClient(ctx context.Context) error {
 }
 
 func ExtractConfigPathFlag(ctx context.Context) string {
-	return extractMeta(ctx).ConfigPathFlag
+	meta := ExtractMeta(ctx)
+	if meta == nil {
+		return ""
+	}
+
+	return meta.ConfigPathFlag
 }
 
 func ExtractProfileFlag(ctx context.Context) string {
-	return extractMeta(ctx).ProfileFlag
+	meta := ExtractMeta(ctx)
+	if meta == nil {
+		return ""
+	}
+
+	return meta.ProfileFlag
 }
 
 // GetDocGenContext returns a minimal context that can be used by scw-doc-gen

core/exec.go

@@ -18,7 +18,7 @@ func defaultOverrideExec(cmd *exec.Cmd) (exitCode int, err error) {
 }
 
 func ExecCmd(ctx context.Context, cmd *exec.Cmd) (exitCode int, err error) {
-	meta := extractMeta(ctx)
+	meta := ExtractMeta(ctx)
 
 	// We do not support override of stdin
 	if cmd.Stdin == nil {

core/shell.go

@@ -28,7 +28,7 @@ type Completer struct {
 func NewShellCompleter(ctx context.Context) *Completer {
 	return &Completer{
 		commands: ExtractCommands(ctx),
-		meta:     extractMeta(ctx),
+		meta:     ExtractMeta(ctx),
 	}
 }
 

core/validate.go

@@ -188,7 +188,7 @@ func validateDeprecated(
 
 		for i := range fieldValues {
 			if rawArgs.ExistsArgByName(strings.Replace(arg.Name, "{index}", strconv.Itoa(i), 1)) {
-				helpCmd := cmd.GetCommandLine(extractMeta(ctx).BinaryName) + " --help"
+				helpCmd := cmd.GetCommandLine(ExtractMeta(ctx).BinaryName) + " --help"
 				ExtractLogger(
 					ctx,
 				).Warningf("The argument '%s' is deprecated, more info with: %s\n", arg.Name, helpCmd)