mcp: fix a bunch of stupid bugs.

helpers.go

@@ -49,7 +49,7 @@ func getJsonsOrBlank() iter.Seq[string] {
 	var curr strings.Builder
 
 	return func(yield func(string) bool) {
-		for stdinLine := range getStdinLinesOrBlank() {
+		hasStdin := writeStdinLinesOrNothing(func(stdinLine string) bool {
 			// we're look for an event, but it may be in multiple lines, so if json parsing fails
 			// we'll try the next line until we're successful
 			curr.WriteString(stdinLine)
@@ -57,24 +57,34 @@ func getJsonsOrBlank() iter.Seq[string] {
 
 			var dummy any
 			if err := json.Unmarshal([]byte(stdinEvent), &dummy); err != nil {
-				continue
+				return true
 			}
 
 			if !yield(stdinEvent) {
-				return
+				return false
 			}
 
 			curr.Reset()
+			return true
+		})
+
+		if !hasStdin {
+			yield("{}")
 		}
 	}
 }
 
 func getStdinLinesOrBlank() iter.Seq[string] {
 	return func(yield func(string) bool) {
-		if hasStdinLines := writeStdinLinesOrNothing(yield); !hasStdinLines {
+		hasStdin := writeStdinLinesOrNothing(func(stdinLine string) bool {
-			return
+			if !yield(stdinLine) {
-		} else {
+				return false
-			return
+			}
+			return true
+		})
+
+		if !hasStdin {
+			yield("")
 		}
 	}
 }
@@ -107,10 +117,7 @@ func writeStdinLinesOrNothing(yield func(string) bool) (hasStdinLines bool) {
 			}
 			hasEmittedAtLeastOne = true
 		}
-		if !hasEmittedAtLeastOne {
+		return hasEmittedAtLeastOne
-			yield("")
-		}
-		return true
 	} else {
 		// not piped
 		return false

mcp.go

@@ -27,6 +27,9 @@ var mcpServer = &cli.Command{
 
 		s.AddTool(mcp.NewTool("publish_note",
 			mcp.WithDescription("Publish a short note event to Nostr with the given text content"),
+			mcp.WithString("relay",
+				mcp.Description("Relay to publish the note to"),
+			),
 			mcp.WithString("content",
 				mcp.Required(),
 				mcp.Description("Arbitrary string to be published"),
@@ -38,6 +41,11 @@ var mcpServer = &cli.Command{
 		), func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 			content, _ := request.Params.Arguments["content"].(string)
 			mention, _ := request.Params.Arguments["mention"].(string)
+			relayI, ok := request.Params.Arguments["relay"]
+			var relay string
+			if ok {
+				relay, _ = relayI.(string)
+			}
 
 			if mention != "" && !nostr.IsValidPublicKey(mention) {
 				return mcp.NewToolResultError("the given mention isn't a valid public key, it must be 32 bytes hex, like the ones returned by search_profile"), nil
@@ -71,16 +79,33 @@ var mcpServer = &cli.Command{
 				relays = []string{"nos.lol", "relay.damus.io"}
 			}
 
-			for res := range sys.Pool.PublishMany(ctx, []string{"nos.lol"}, evt) {
+			// extra relay specified
+			relays = append(relays, relay)
+
+			result := strings.Builder{}
+			result.WriteString(
+				fmt.Sprintf("the event we generated has id '%s', kind '%d' and is signed by pubkey '%s'. ",
+					evt.ID,
+					evt.Kind,
+					evt.PubKey,
+				),
+			)
+
+			for res := range sys.Pool.PublishMany(ctx, relays, evt) {
 				if res.Error != nil {
-					return mcp.NewToolResultError(
+					result.WriteString(
-						fmt.Sprintf("there was an error publishing the event to the relay %s",
+						fmt.Sprintf("there was an error publishing the event to the relay %s. ",
 							res.RelayURL),
-					), nil
+					)
+				} else {
+					result.WriteString(
+						fmt.Sprintf("the event was successfully published to the relay %s. ",
+							res.RelayURL),
+					)
 				}
 			}
 
-			return mcp.NewToolResultText("event was successfully published with id " + evt.ID), nil
+			return mcp.NewToolResultText(result.String()), nil
 		})
 
 		s.AddTool(mcp.NewTool("resolve_nostr_uri",
@@ -152,13 +177,9 @@ var mcpServer = &cli.Command{
 				mcp.Description("Public key of Nostr user we want to know the relay from where to read"),
 			),
 		), func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-			name, _ := request.Params.Arguments["name"].(string)
+			pubkey, _ := request.Params.Arguments["pubkey"].(string)
-			re := sys.Pool.QuerySingle(ctx, []string{"relay.nostr.band", "nostr.wine"}, nostr.Filter{Search: name, Kinds: []int{0}})
+			res := sys.FetchOutboxRelays(ctx, pubkey, 1)
-			if re == nil {
+			return mcp.NewToolResultText(res[0]), nil
-				return mcp.NewToolResultError("couldn't find anyone with that name"), nil
-			}
-
-			return mcp.NewToolResultText(re.PubKey), nil
 		})
 
 		s.AddTool(mcp.NewTool("read_events_from_relay",
@@ -182,7 +203,11 @@ var mcpServer = &cli.Command{
 			relay, _ := request.Params.Arguments["relay"].(string)
 			limit, _ := request.Params.Arguments["limit"].(int)
 			kind, _ := request.Params.Arguments["kind"].(int)
-			pubkey, _ := request.Params.Arguments["pubkey"].(string)
+			pubkeyI, ok := request.Params.Arguments["pubkey"]
+			var pubkey string
+			if ok {
+				pubkey, _ = pubkeyI.(string)
+			}
 
 			if pubkey != "" && !nostr.IsValidPublicKey(pubkey) {
 				return mcp.NewToolResultError("the given pubkey isn't a valid public key, it must be 32 bytes hex, like the ones returned by search_profile"), nil
@@ -198,7 +223,6 @@ var mcpServer = &cli.Command{
 
 			events := sys.Pool.SubManyEose(ctx, []string{relay}, nostr.Filters{filter})
 
-
 			result := strings.Builder{}
 			for ie := range events {
 				result.WriteString("author public key: ")