chore: update upserTools and tool to instantiate client correcty

Author: stepskop

src/const.ts

@@ -61,7 +61,9 @@ export const SKYFIRE_SELLER_ID = process.env.SKYFIRE_SELLER_SERVICE_ID;
 
 export const SKYFIRE_TOOL_INSTRUCTIONS = `To run the Actor, you need to provide a Skyfire payment ID in the \`skyfire-pay-id\` input property. You first need to create the Skyfire PAY token by calling the \`create-pay-token\` tool from the Skyfire MCP server and then provide the created token in the \`skyfire-pay-id\` input property when calling Actor tool. The Skyfire PAY token is used for billing purposes and needs to be charged with at least ${SKYFIRE_MIN_CHARGE_USD} USD.${SKYFIRE_SELLER_ID ? ` The Skyfire seller ID for Apify MCP server is "${SKYFIRE_SELLER_ID}".` : ''} When retrieving Actor output using the \`get-actor-output\` tool, you also need to provide the same Skyfire PAY token ID in the \`skyfire-pay-id\` input property.`;
 
-export const SKYFIRE_PAY_ID_PROPERTY_DESCRIPTION = `Skyfire PAY token ID used for billing purposes.`;
+export const SKYFIRE_ACTOR_SEARCH_INSTRUCTIONS = `To search for Actors, you need to provide valid Skyfire KYA token for identification in the \`skyfire-pay-id\` input property. You first need to create the Skyfire token by calling the \`create-kya-token\` tool from the Skyfire MCP server.${SKYFIRE_SELLER_ID ? ` The Skyfire seller ID for Apify MCP server is "${SKYFIRE_SELLER_ID}".` : ''} Alternatively you can provide PAY or KYA+PAY token instead.`;
+
+export const SKYFIRE_PAY_ID_PROPERTY_DESCRIPTION = `Skyfire PAY, KYA, KYA+PAY token ID used for authentication and billing purposes.`;
 
 export const SKYFIRE_README_CONTENT = `The Apify MCP Server allows clients to interact with Apify Actors, storage, and documentation. Before running any Apify Actor, you need to set up a Skyfire PAY token for billing purposes. To set up the PAY token you need to use the create-pay-token tool from the Skyfire MCP server. The PAY token must be charged with a minimum of ${SKYFIRE_MIN_CHARGE_USD} USD to be valid.${SKYFIRE_SELLER_ID ? ` The Skyfire seller ID for Apify MCP server is "${SKYFIRE_SELLER_ID}".` : ''} When running an Actor using the call-actor tool, you must provide the Skyfire PAY token ID in the \`skyfire-pay-id\` input property. Similarly, when retrieving Actor output using the get-actor-output tool, you must also provide the same Skyfire PAY token ID in the \`skyfire-pay-id\` input property.`;
 

src/mcp/server.ts

@@ -30,6 +30,7 @@ import {
     HelperTools,
     SERVER_NAME,
     SERVER_VERSION,
+    SKYFIRE_ACTOR_SEARCH_INSTRUCTIONS,
     SKYFIRE_PAY_ID_PROPERTY_DESCRIPTION,
     SKYFIRE_README_CONTENT,
     SKYFIRE_TOOL_INSTRUCTIONS,
@@ -272,7 +273,12 @@ export class ActorsMcpServer {
                     || (wrap.type === 'internal' && wrap.tool.name === HelperTools.ACTOR_CALL)
                     || (wrap.type === 'internal' && wrap.tool.name === HelperTools.ACTOR_OUTPUT_GET)) {
                     // Add Skyfire instructions to description if not already present
-                    if (!wrap.tool.description.includes(SKYFIRE_TOOL_INSTRUCTIONS)) {
+                    if (wrap.type === 'internal' && wrap.tool.name === HelperTools.STORE_SEARCH) {
+                        // Add description
+                        if (!wrap.tool.description.includes(SKYFIRE_ACTOR_SEARCH_INSTRUCTIONS)) {
+                            wrap.tool.description += `\n\n${SKYFIRE_ACTOR_SEARCH_INSTRUCTIONS}`;
+                        }
+                    } else if (!wrap.tool.description.includes(SKYFIRE_TOOL_INSTRUCTIONS)) {
                         wrap.tool.description += `\n\n${SKYFIRE_TOOL_INSTRUCTIONS}`;
                     }
                     // Add skyfire-pay-id property if not present

src/tools/store_collection.ts

@@ -3,7 +3,7 @@ import { z } from 'zod';
 import zodToJsonSchema from 'zod-to-json-schema';
 
 import { ApifyClient } from '../apify-client.js';
-import { ACTOR_SEARCH_ABOVE_LIMIT, HelperTools } from '../const.js';
+import { ACTOR_SEARCH_ABOVE_LIMIT, HelperTools, SKYFIRE_ACTOR_SEARCH_INSTRUCTIONS } from '../const.js';
 import type { ActorPricingModel, ExtendedActorStoreList, HelperTool, ToolEntry } from '../types.js';
 import { formatActorToActorCard } from '../utils/actor-card.js';
 import { ajv } from '../utils/ajv.js';
@@ -13,11 +13,17 @@ export async function searchActorsByKeywords(
     apifyToken: string,
     limit: number | undefined = undefined,
     offset: number | undefined = undefined,
-    allowsAgenticUsers: boolean | undefined = undefined,
+    skyfirePayId: string | undefined = undefined,
 ): Promise<ExtendedActorStoreList[]> {
-    const client = new ApifyClient({ token: apifyToken });
+
+    /**
+     * Create Apify token, for Skyfire mode use `skyfire-pay-id` and for normal mode use `apifyToken`.
+     */
+    const client = skyfirePayId
+        ? new ApifyClient({ skyfirePayId })
+        : new ApifyClient({ token: apifyToken });
     const storeClient = client.store();
-    if (allowsAgenticUsers !== undefined) storeClient.params = { ...storeClient.params, allowsAgenticUsers };
+    if (skyfirePayId) storeClient.params = { ...storeClient.params, allowsAgenticUsers: true };
 
     const results = await storeClient.list({ search, limit, offset });
     return results.items;
@@ -96,12 +102,28 @@ USAGE EXAMPLES:
         call: async (toolArgs) => {
             const { args, apifyToken, userRentedActorIds, apifyMcpServer } = toolArgs;
             const parsed = searchActorsArgsSchema.parse(args);
+
+            /**
+             * In Skyfire mode, we check for the presence of `skyfire-pay-id`.
+             * If it is missing, we return instructions to the LLM on how to create it and pass it to the tool.
+             */
+            if (apifyMcpServer.options.skyfireMode
+                && args['skyfire-pay-id'] === undefined
+            ) {
+                return {
+                    content: [{
+                        type: 'text',
+                        text: SKYFIRE_ACTOR_SEARCH_INSTRUCTIONS,
+                    }],
+                };
+            }
+
             let actors = await searchActorsByKeywords(
                 parsed.search,
                 apifyToken,
                 parsed.limit + ACTOR_SEARCH_ABOVE_LIMIT,
                 parsed.offset,
-                apifyMcpServer.options.skyfireMode ? true : undefined, // allowsAgenticUsers - filters Actors available for Agentic users
+                apifyMcpServer.options.skyfireMode && typeof args['skyfire-pay-id'] === 'string' ? args['skyfire-pay-id'] : undefined, // // skyfirePayId
             );
             actors = filterRentalActors(actors || [], userRentedActorIds || []).slice(0, parsed.limit);
             const actorCards = actors.length === 0 ? [] : actors.map(formatActorToActorCard);