@apify/actors-mcp-server 0.9.20-beta.0 → 0.9.20-beta.10

package/dist/utils/pricing_info.js

@@ -1,160 +1,393 @@
-import { ACTOR_PRICING_MODEL } from '../const.js';
 /**
- * Returns the most recent valid pricing information from a list of pricing infos,
- * based on the provided current date.
+ * Pricing output contract for Actor cards.
+ *
+ * Text callers:
+ * - `pricingInfoToString`: complete mode for `fetch-actor-details`
+ * - `pricingInfoToSimplifiedString`: simplified mode for `search-actors`
+ *
+ * Structured callers:
+ * - `pricingInfoToStructured`: complete mode
+ * - `pricingInfoToSimplifiedStructured`: simplified mode
+ *
+ * Structured output shape is mostly the same in both modes:
+ * {
+ *   model: string,
+ *   userTier?: PricingTier,
+ *   pricePerUnit?: number,
+ *   unitName?: string,
+ *   trialMinutes?: number,
+ *   tieredPricing?: [{ tier: string, pricePerUnit: number }],
+ *   events?: [{
+ *     title: string,
+ *     description?: string,
+ *     priceUsd?: number,
+ *     tieredPricing?: [{ tier: string, priceUsd: number }],
+ *   }],
+ *   pricingNote?: string,
+ *   eventDescriptionsOmitted?: boolean,
+ *   eventDescriptionsNote?: string,
+ * }
+ *
+ * Complete mode keeps full tier matrices and never sets `pricingNote`.
+ *
+ * Simplified mode picks a single tier from each tiered map
+ * (requested tier -> FREE -> first entry) and emits `pricingNote` only when
+ * the Actor actually has multiple tiers *and* they resolve consistently. The
+ * note is omitted for single-tier Actors (the note's "higher tiers may offer
+ * lower prices" promise is vacuous) and when PAY_PER_EVENT events resolve
+ * to different tiers (no truthful single label).
  *
- * Filters out pricing infos that have a `startedAt` date in the future or missing,
- * then sorts the remaining infos by `startedAt` in descending order (most recent first).
- * Returns the most recent valid pricing info, or `null` if none are valid.
+ * Simplified `PAY_PER_EVENT` also trims long event lists:
+ * - `events.length <= 5`: keep event descriptions
+ * - `events.length > 5`: omit event descriptions and set
+ *   `eventDescriptionsOmitted` / `eventDescriptionsNote`
+ *
+ * Single-tier buckets stay as 1-element `tieredPricing` arrays in both modes.
+ * `FREE` or `null` input returns the free text / structured shape.
+ *
+ * Full examples and contract details are documented inline in this module.
  */
+import { ACTOR_PRICING_MODEL } from '../const.js';
+export const PRICING_TIERS = ['FREE', 'BRONZE', 'SILVER', 'GOLD', 'PLATINUM', 'DIAMOND'];
+const FREE_ACTOR_TEXT = 'This Actor is free to use. You are only charged for Apify platform usage.';
+const UNKNOWN_PRICING_TEXT = 'Pricing information is not available.';
+const EVENTS_UNAVAILABLE_TEXT = 'Pricing information for events is not available.';
+const EVENT_DESCRIPTION_LIMIT = 5;
+const EVENT_DESCRIPTIONS_OMITTED_NOTE = 'Event descriptions were omitted because this actor has many pricing events. '
+    + 'Use fetch-actor-details for full pricing details.';
+function resolveTier(map, userTier) {
+    if (map[userTier])
+        return { tier: userTier, value: map[userTier] };
+    if (map.FREE)
+        return { tier: 'FREE', value: map.FREE };
+    // Pathological fallback: actor provides neither the user's tier nor FREE.
+    // `Object.entries` order is spec-guaranteed to be insertion order for string keys,
+    // so we pick whichever tier the API serialised first. Rarely fires — virtually every
+    // actor defines FREE.
+    const [firstTier, firstValue] = Object.entries(map)[0];
+    return { tier: firstTier, value: firstValue };
+}
+/**
+ * Builds the simplified-mode pricing note, or returns null when no note should be shown.
+ * DIAMOND is the top tier — "higher tiers may offer lower prices" is vacuous, so we skip
+ * the note for DIAMOND users.
+ */
+function buildPricingNote(resolvedTier) {
+    if (resolvedTier === 'DIAMOND')
+        return null;
+    return `Prices shown are for ${resolvedTier} tier. `
+        + `Higher tiers may offer lower prices — use fetch-actor-details to see the full pricing table.`;
+}
+function getSingleResolvedTier(resolvedTiers) {
+    var _a;
+    if (resolvedTiers.size !== 1)
+        return null;
+    return (_a = resolvedTiers.values().next().value) !== null && _a !== void 0 ? _a : null;
+}
+function isFreeActor(info) {
+    return !info || info.pricingModel === ACTOR_PRICING_MODEL.FREE;
+}
+function hasTiers(map) {
+    return !!map && Object.keys(map).length > 0;
+}
+function hasMultipleTiers(map) {
+    return !!map && Object.keys(map).length > 1;
+}
+function shouldOmitEventDescriptions(eventCount) {
+    return eventCount > EVENT_DESCRIPTION_LIMIT;
+}
+function convertMinutesToGreatestUnit(minutes) {
+    if (minutes < 60)
+        return { value: minutes, unit: 'minutes' };
+    if (minutes < 60 * 24)
+        return { value: Math.floor(minutes / 60), unit: 'hours' };
+    return { value: Math.floor(minutes / (60 * 24)), unit: 'days' };
+}
 export function getCurrentPricingInfo(pricingInfos, now) {
-    // Filter out all future dates and those without a startedAt date
+    var _a;
     const validPricingInfos = pricingInfos.filter((info) => {
         if (!info.startedAt)
             return false;
-        const startedAt = new Date(info.startedAt);
-        return startedAt <= now;
+        return new Date(info.startedAt) <= now;
     });
-    // Sort and return the most recent pricing info
     validPricingInfos.sort((a, b) => {
         const aDate = new Date(a.startedAt || 0);
         const bDate = new Date(b.startedAt || 0);
-        return bDate.getTime() - aDate.getTime(); // Sort descending
+        return bDate.getTime() - aDate.getTime();
     });
-    if (validPricingInfos.length > 0) {
-        return validPricingInfos[0]; // Return the most recent pricing info
+    return (_a = validPricingInfos[0]) !== null && _a !== void 0 ? _a : null;
+}
+/** Complete text contract used by `fetch-actor-details`. */
+export function pricingInfoToString(pricingInfo) {
+    if (isFreeActor(pricingInfo))
+        return FREE_ACTOR_TEXT;
+    switch (pricingInfo.pricingModel) {
+        case ACTOR_PRICING_MODEL.PRICE_PER_DATASET_ITEM:
+            return formatDatasetItemComplete(pricingInfo);
+        case ACTOR_PRICING_MODEL.FLAT_PRICE_PER_MONTH:
+            return formatRentalComplete(pricingInfo);
+        case ACTOR_PRICING_MODEL.PAY_PER_EVENT:
+            return formatPayPerEventComplete(pricingInfo.pricingPerEvent);
+        default:
+            return UNKNOWN_PRICING_TEXT;
     }
-    return null;
 }
-function convertMinutesToGreatestUnit(minutes) {
-    if (minutes < 60) {
-        return { value: minutes, unit: 'minutes' };
+function formatDatasetItemComplete(info) {
+    var _a;
+    const unitLabel = info.unitName ? `${info.unitName}s` : 'results';
+    const tierEntries = info.tieredPricing ? Object.entries(info.tieredPricing) : [];
+    if (tierEntries.length > 1) {
+        const tierList = tierEntries
+            .map(([tier, obj]) => `${tier}: $${obj.tieredPricePerUnitUsd * 1000}`)
+            .join(', ');
+        return `This Actor has tiered pricing per 1000 ${unitLabel}: ${tierList}.`;
     }
-    if (minutes < 60 * 24) { // Less than 24 hours
-        return { value: Math.floor(minutes / 60), unit: 'hours' };
-    } // 24 hours or more
-    return { value: Math.floor(minutes / (60 * 24)), unit: 'days' };
+    const price = tierEntries.length === 1
+        ? tierEntries[0][1].tieredPricePerUnitUsd
+        : ((_a = info.pricePerUnitUsd) !== null && _a !== void 0 ? _a : 0);
+    return `This Actor costs $${price * 1000} per 1000 ${unitLabel}.`;
 }
-/**
- * Formats the pay-per-event pricing information into a human-readable string.
- *
- * Example:
- * This Actor is paid per event. You are not charged for the Apify platform usage, but only a fixed price for the following events:
- *         - Event title: Event description (Flat price: $X per event)
- *         - MCP server startup: Initial fee for starting the Kiwi MCP Server Actor (Flat price: $0.1 per event)
- *         - Flight search: Fee for searching flights using the Kiwi.com flight search engine (Flat price: $0.001 per event)
- *
- * For tiered pricing, the output is more complicated and the question is whether we want to simplify it in the future.
- * @param pricingPerEvent
- */
-function payPerEventPricingToString(pricingPerEvent) {
-    if (!pricingPerEvent || !pricingPerEvent.actorChargeEvents)
-        return 'Pricing information for events is not available.';
-    const eventStrings = [];
-    for (const event of Object.values(pricingPerEvent.actorChargeEvents)) {
-        let eventStr = `\t- **${event.eventTitle}**: ${event.eventDescription} `;
-        if (typeof event.eventPriceUsd === 'number') {
-            eventStr += `(Flat price: $${event.eventPriceUsd} per event)`;
-        }
-        else if (event.eventTieredPricingUsd) {
-            const tiers = Object.entries(event.eventTieredPricingUsd)
-                .map(([tier, price]) => `${tier}: $${price.tieredEventPriceUsd}`)
-                .join(', ');
-            eventStr += `(Tiered pricing: ${tiers} per event)`;
-        }
-        else {
-            eventStr += '(No price info)';
-        }
-        eventStrings.push(eventStr);
+function formatRentalComplete(info) {
+    var _a;
+    const { value, unit } = convertMinutesToGreatestUnit(info.trialMinutes || 0);
+    const tierEntries = info.tieredPricing ? Object.entries(info.tieredPricing) : [];
+    if (tierEntries.length > 1) {
+        const tierList = tierEntries
+            .map(([tier, obj]) => `${tier}: $${obj.tieredPricePerUnitUsd}`)
+            .join(', ');
+        return `This Actor is rental and has tiered pricing per month: ${tierList}, `
+            + `with a trial period of ${value} ${unit}.`;
     }
-    return `This Actor is paid per event. You are not charged for the Apify platform usage, but only a fixed price for the following events:\n${eventStrings.join('\n')}`;
+    const price = tierEntries.length === 1
+        ? tierEntries[0][1].tieredPricePerUnitUsd
+        : ((_a = info.pricePerUnitUsd) !== null && _a !== void 0 ? _a : 0);
+    return `This Actor is rental and costs $${price} per month, with a trial period of ${value} ${unit}.`;
 }
-export function pricingInfoToString(pricingInfo) {
-    // If there is no pricing infos entries the Actor is free to use
-    // based on https://github.com/apify/apify-core/blob/058044945f242387dde2422b8f1bef395110a1bf/src/packages/actor/src/paid_actors/paid_actors_common.ts#L691
-    if (pricingInfo === null || pricingInfo.pricingModel === ACTOR_PRICING_MODEL.FREE) {
-        return 'This Actor is free to use. You are only charged for Apify platform usage.';
+function formatPayPerEventComplete(pricingPerEvent) {
+    if (!(pricingPerEvent === null || pricingPerEvent === void 0 ? void 0 : pricingPerEvent.actorChargeEvents))
+        return EVENTS_UNAVAILABLE_TEXT;
+    const eventLines = Object.values(pricingPerEvent.actorChargeEvents).map((event) => {
+        var _a;
+        const detail = formatCompleteEventDetail(event);
+        return `\t- **${event.eventTitle}**: ${(_a = event.eventDescription) !== null && _a !== void 0 ? _a : ''} (${detail})`;
+    });
+    return `This Actor is paid per event:\n${eventLines.join('\n')}`;
+}
+function formatCompleteEventDetail(event) {
+    if (typeof event.eventPriceUsd === 'number')
+        return `$${event.eventPriceUsd} per event`;
+    const tiered = event.eventTieredPricingUsd;
+    if (!hasTiers(tiered))
+        return 'No price info';
+    if (hasMultipleTiers(tiered)) {
+        return `${Object.entries(tiered)
+            .map(([tier, price]) => `${tier}: $${price.tieredEventPriceUsd}`)
+            .join(', ')} per event`;
     }
-    if (pricingInfo.pricingModel === ACTOR_PRICING_MODEL.PRICE_PER_DATASET_ITEM) {
-        const customUnitName = pricingInfo.unitName !== 'result' ? pricingInfo.unitName : '';
-        // Handle tiered pricing if present
-        if (pricingInfo.tieredPricing && Object.keys(pricingInfo.tieredPricing).length > 0) {
-            const tiers = Object.entries(pricingInfo.tieredPricing)
-                .map(([tier, obj]) => `${tier}: $${obj.tieredPricePerUnitUsd * 1000} per 1000 ${customUnitName || 'results'}`)
-                .join(', ');
-            return `This Actor charges per results${customUnitName ? ` (in this case named ${customUnitName})` : ''}; tiered pricing per 1000 ${customUnitName || 'results'}: ${tiers}.`;
-        }
-        return `This Actor charges per results${customUnitName ? ` (in this case named ${customUnitName})` : ''}; the price per 1000 ${customUnitName || 'results'} is ${pricingInfo.pricePerUnitUsd * 1000} USD.`;
+    const [price] = Object.values(tiered);
+    return `$${price.tieredEventPriceUsd} per event`;
+}
+/** Complete structured contract used by `fetch-actor-details`. */
+export function pricingInfoToStructured(pricingInfo, userTier) {
+    const base = createStructuredBase(pricingInfo, userTier);
+    if (isFreeActor(pricingInfo))
+        return base;
+    switch (pricingInfo.pricingModel) {
+        case ACTOR_PRICING_MODEL.PRICE_PER_DATASET_ITEM:
+            return { ...base, unitName: pricingInfo.unitName || 'result', ...structureTieredUnitComplete(pricingInfo) };
+        case ACTOR_PRICING_MODEL.FLAT_PRICE_PER_MONTH:
+            return { ...base, trialMinutes: pricingInfo.trialMinutes, ...structureTieredUnitComplete(pricingInfo) };
+        case ACTOR_PRICING_MODEL.PAY_PER_EVENT:
+            return { ...base, ...structurePayPerEventComplete(pricingInfo.pricingPerEvent) };
+        default:
+            return base;
     }
-    if (pricingInfo.pricingModel === ACTOR_PRICING_MODEL.FLAT_PRICE_PER_MONTH) {
-        const { value, unit } = convertMinutesToGreatestUnit(pricingInfo.trialMinutes || 0);
-        // Handle tiered pricing if present
-        if (pricingInfo.tieredPricing && Object.keys(pricingInfo.tieredPricing).length > 0) {
-            const tiers = Object.entries(pricingInfo.tieredPricing)
-                .map(([tier, obj]) => `${tier}: $${obj.tieredPricePerUnitUsd} per month`)
-                .join(', ');
-            return `This Actor is rental and has tiered pricing per month: ${tiers}, with a trial period of ${value} ${unit}.`;
-        }
-        return `This Actor is rental and has a flat price of ${pricingInfo.pricePerUnitUsd} USD per month, with a trial period of ${value} ${unit}.`;
+}
+function createStructuredBase(pricingInfo, userTier) {
+    return {
+        model: (pricingInfo === null || pricingInfo === void 0 ? void 0 : pricingInfo.pricingModel) || ACTOR_PRICING_MODEL.FREE,
+        userTier,
+    };
+}
+function structureTieredUnitComplete(info) {
+    var _a;
+    const patch = { pricePerUnit: (_a = info.pricePerUnitUsd) !== null && _a !== void 0 ? _a : 0 };
+    if (hasTiers(info.tieredPricing)) {
+        patch.tieredPricing = Object.entries(info.tieredPricing).map(([tier, obj]) => ({
+            tier,
+            pricePerUnit: obj.tieredPricePerUnitUsd,
+        }));
     }
-    if (pricingInfo.pricingModel === ACTOR_PRICING_MODEL.PAY_PER_EVENT) {
-        return payPerEventPricingToString(pricingInfo.pricingPerEvent);
+    return patch;
+}
+function structurePayPerEventComplete(pricingPerEvent) {
+    if (!(pricingPerEvent === null || pricingPerEvent === void 0 ? void 0 : pricingPerEvent.actorChargeEvents))
+        return {};
+    return {
+        events: Object.values(pricingPerEvent.actorChargeEvents).map((event) => ({
+            title: event.eventTitle,
+            description: event.eventDescription || '',
+            priceUsd: typeof event.eventPriceUsd === 'number' ? event.eventPriceUsd : undefined,
+            tieredPricing: event.eventTieredPricingUsd
+                ? Object.entries(event.eventTieredPricingUsd)
+                    .map(([tier, price]) => ({ tier, priceUsd: price.tieredEventPriceUsd }))
+                : undefined,
+        })),
+    };
+}
+/** Simplified text contract used by `search-actors`. */
+export function pricingInfoToSimplifiedString(pricingInfo, userTier) {
+    if (isFreeActor(pricingInfo))
+        return FREE_ACTOR_TEXT;
+    switch (pricingInfo.pricingModel) {
+        case ACTOR_PRICING_MODEL.PRICE_PER_DATASET_ITEM:
+            return formatDatasetItemSimplified(pricingInfo, userTier);
+        case ACTOR_PRICING_MODEL.FLAT_PRICE_PER_MONTH:
+            return formatRentalSimplified(pricingInfo, userTier);
+        case ACTOR_PRICING_MODEL.PAY_PER_EVENT:
+            return formatPayPerEventSimplified(pricingInfo.pricingPerEvent, userTier);
+        default:
+            return UNKNOWN_PRICING_TEXT;
     }
-    return 'Pricing information is not available.';
 }
-/**
- * Transform and normalize API response to match unstructured text output format
- * instead of just dumping raw API data - ensures consistency across structured & unstructured modes.
- */
-export function pricingInfoToStructured(pricingInfo) {
+function formatDatasetItemSimplified(info, userTier) {
     var _a;
-    const structuredPricing = {
-        model: (pricingInfo === null || pricingInfo === void 0 ? void 0 : pricingInfo.pricingModel) || ACTOR_PRICING_MODEL.FREE,
-        isFree: !pricingInfo || pricingInfo.pricingModel === ACTOR_PRICING_MODEL.FREE,
-    };
-    if (!pricingInfo || pricingInfo.pricingModel === ACTOR_PRICING_MODEL.FREE) {
-        return structuredPricing;
+    const unitLabel = info.unitName ? `${info.unitName}s` : 'results';
+    if (hasTiers(info.tieredPricing)) {
+        const { tier, value } = resolveTier(info.tieredPricing, userTier);
+        const base = `This Actor costs $${value.tieredPricePerUnitUsd * 1000} per 1000 ${unitLabel}.`;
+        const note = hasMultipleTiers(info.tieredPricing) ? buildPricingNote(tier) : null;
+        return note ? `${base} ${note}` : base;
     }
-    if (pricingInfo.pricingModel === ACTOR_PRICING_MODEL.PRICE_PER_DATASET_ITEM) {
-        structuredPricing.pricePerUnit = pricingInfo.pricePerUnitUsd || 0;
-        structuredPricing.unitName = pricingInfo.unitName || 'result';
-        if (pricingInfo.tieredPricing && Object.keys(pricingInfo.tieredPricing).length > 0) {
-            structuredPricing.tieredPricing = Object.entries(pricingInfo.tieredPricing).map(([tier, obj]) => ({
-                tier,
-                pricePerUnit: obj.tieredPricePerUnitUsd,
-            }));
-        }
+    return `This Actor costs $${((_a = info.pricePerUnitUsd) !== null && _a !== void 0 ? _a : 0) * 1000} per 1000 ${unitLabel}.`;
+}
+function formatRentalSimplified(info, userTier) {
+    var _a;
+    const { value, unit } = convertMinutesToGreatestUnit(info.trialMinutes || 0);
+    if (hasTiers(info.tieredPricing)) {
+        const { tier, value: entry } = resolveTier(info.tieredPricing, userTier);
+        const base = `This Actor is rental and costs $${entry.tieredPricePerUnitUsd} per month, `
+            + `with a trial period of ${value} ${unit}.`;
+        const note = hasMultipleTiers(info.tieredPricing) ? buildPricingNote(tier) : null;
+        return note ? `${base} ${note}` : base;
     }
-    else if (pricingInfo.pricingModel === ACTOR_PRICING_MODEL.FLAT_PRICE_PER_MONTH) {
-        structuredPricing.pricePerUnit = pricingInfo.pricePerUnitUsd;
-        structuredPricing.trialMinutes = pricingInfo.trialMinutes;
-        if (pricingInfo.tieredPricing && Object.keys(pricingInfo.tieredPricing).length > 0) {
-            structuredPricing.tieredPricing = Object.entries(pricingInfo.tieredPricing).map(([tier, obj]) => ({
-                tier,
-                pricePerUnit: obj.tieredPricePerUnitUsd,
-            }));
+    return `This Actor is rental and costs $${(_a = info.pricePerUnitUsd) !== null && _a !== void 0 ? _a : 0} per month, with a trial period of ${value} ${unit}.`;
+}
+function formatPayPerEventSimplified(pricingPerEvent, userTier) {
+    if (!(pricingPerEvent === null || pricingPerEvent === void 0 ? void 0 : pricingPerEvent.actorChargeEvents))
+        return EVENTS_UNAVAILABLE_TEXT;
+    const events = Object.values(pricingPerEvent.actorChargeEvents);
+    const omitDescriptions = shouldOmitEventDescriptions(events.length);
+    const resolvedTiers = new Set();
+    const eventLines = events.map((event) => {
+        var _a;
+        let price;
+        if (typeof event.eventPriceUsd === 'number') {
+            price = event.eventPriceUsd;
         }
-    }
-    else if (pricingInfo.pricingModel === ACTOR_PRICING_MODEL.PAY_PER_EVENT) {
-        if ((_a = pricingInfo.pricingPerEvent) === null || _a === void 0 ? void 0 : _a.actorChargeEvents) {
-            const { actorChargeEvents } = pricingInfo.pricingPerEvent;
-            structuredPricing.events = Object.entries(actorChargeEvents).map(([, event]) => {
-                const actorEvent = event;
-                return {
-                    title: actorEvent.eventTitle,
-                    description: actorEvent.eventDescription || '',
-                    priceUsd: typeof actorEvent.eventPriceUsd === 'number' ? actorEvent.eventPriceUsd : undefined,
-                    tieredPricing: actorEvent.eventTieredPricingUsd
-                        ? Object.entries(actorEvent.eventTieredPricingUsd)
-                            .map(([tier, price]) => ({
-                            tier,
-                            priceUsd: price.tieredEventPriceUsd,
-                        }))
-                        : undefined,
-                };
-            });
+        else if (event.eventTieredPricingUsd) {
+            const tieredMap = event.eventTieredPricingUsd;
+            if (hasTiers(tieredMap)) {
+                const { tier, value } = resolveTier(tieredMap, userTier);
+                resolvedTiers.add(tier);
+                price = value.tieredEventPriceUsd;
+            }
+        }
+        const detail = typeof price === 'number' ? `$${price} per event` : 'No price info';
+        if (omitDescriptions)
+            return `\t- **${event.eventTitle}**: ${detail}`;
+        return `\t- **${event.eventTitle}**: ${(_a = event.eventDescription) !== null && _a !== void 0 ? _a : ''} (${detail})`;
+    });
+    const body = `This Actor is paid per event:\n${eventLines.join('\n')}`;
+    const anyMultiTier = events.some((event) => hasMultipleTiers(event.eventTieredPricingUsd));
+    const noteTier = anyMultiTier ? getSingleResolvedTier(resolvedTiers) : null;
+    const pricingNote = noteTier ? buildPricingNote(noteTier) : null;
+    const tail = [pricingNote, omitDescriptions ? EVENT_DESCRIPTIONS_OMITTED_NOTE : null]
+        .filter((n) => !!n)
+        .join('\n');
+    return tail ? `${body}\n${tail}` : body;
+}
+/** Simplified structured contract used by `search-actors`. */
+export function pricingInfoToSimplifiedStructured(pricingInfo, userTier) {
+    const base = createStructuredBase(pricingInfo, userTier);
+    if (isFreeActor(pricingInfo))
+        return base;
+    const { patch, noteTier } = resolveSimplifiedPatch(pricingInfo, userTier);
+    const pricingNote = noteTier ? buildPricingNote(noteTier) : null;
+    return {
+        ...base,
+        ...patch,
+        ...(pricingNote ? { pricingNote } : {}),
+    };
+}
+function resolveSimplifiedPatch(pricingInfo, userTier) {
+    switch (pricingInfo.pricingModel) {
+        case ACTOR_PRICING_MODEL.PRICE_PER_DATASET_ITEM: {
+            const r = structureTieredUnitSimplified(pricingInfo, userTier);
+            return { patch: { unitName: pricingInfo.unitName || 'result', ...r.patch }, noteTier: r.noteTier };
+        }
+        case ACTOR_PRICING_MODEL.FLAT_PRICE_PER_MONTH: {
+            const r = structureTieredUnitSimplified(pricingInfo, userTier);
+            return { patch: { trialMinutes: pricingInfo.trialMinutes, ...r.patch }, noteTier: r.noteTier };
         }
+        case ACTOR_PRICING_MODEL.PAY_PER_EVENT:
+            return structurePayPerEventSimplified(pricingInfo.pricingPerEvent, userTier);
+        default:
+            return { patch: {}, noteTier: null };
+    }
+}
+function structureTieredUnitSimplified(info, userTier) {
+    var _a;
+    const patch = { pricePerUnit: (_a = info.pricePerUnitUsd) !== null && _a !== void 0 ? _a : 0 };
+    if (hasTiers(info.tieredPricing)) {
+        const { tier, value } = resolveTier(info.tieredPricing, userTier);
+        patch.tieredPricing = [{ tier, pricePerUnit: value.tieredPricePerUnitUsd }];
+        patch.pricePerUnit = value.tieredPricePerUnitUsd;
+        return { patch, noteTier: hasMultipleTiers(info.tieredPricing) ? tier : null };
     }
-    return structuredPricing;
+    return { patch, noteTier: null };
+}
+function structurePayPerEventSimplified(pricingPerEvent, userTier) {
+    if (!(pricingPerEvent === null || pricingPerEvent === void 0 ? void 0 : pricingPerEvent.actorChargeEvents))
+        return { patch: {}, noteTier: null };
+    const rawEvents = Object.values(pricingPerEvent.actorChargeEvents);
+    const omitDescriptions = shouldOmitEventDescriptions(rawEvents.length);
+    const resolvedTiers = new Set();
+    const events = rawEvents.map((event) => {
+        const baseEvent = {
+            title: event.eventTitle,
+            ...(omitDescriptions ? {} : { description: event.eventDescription || '' }),
+        };
+        if (typeof event.eventPriceUsd === 'number') {
+            return { ...baseEvent, priceUsd: event.eventPriceUsd };
+        }
+        const tieredMap = event.eventTieredPricingUsd;
+        if (!hasTiers(tieredMap))
+            return baseEvent;
+        const { tier, value } = resolveTier(tieredMap, userTier);
+        resolvedTiers.add(tier);
+        // `priceUsd` is set in addition to `tieredPricing` so the widget's FREE-tier
+        // fallback (src/web/src/utils/formatting.ts) can render a concrete price for
+        // FREE-tier users instead of the generic "Pay per event" fallback.
+        return {
+            ...baseEvent,
+            priceUsd: value.tieredEventPriceUsd,
+            tieredPricing: [{ tier, priceUsd: value.tieredEventPriceUsd }],
+        };
+    });
+    const anyMultiTier = rawEvents.some((event) => hasMultipleTiers(event.eventTieredPricingUsd));
+    const noteTier = anyMultiTier ? getSingleResolvedTier(resolvedTiers) : null;
+    return {
+        patch: {
+            events,
+            ...(omitDescriptions
+                ? {
+                    eventDescriptionsOmitted: true,
+                    eventDescriptionsNote: EVENT_DESCRIPTIONS_OMITTED_NOTE,
+                }
+                : {}),
+        },
+        noteTier,
+    };
 }
 //# sourceMappingURL=pricing_info.js.map

package/dist/utils/pricing_info.js.map

@@ -1 +1 @@
-{"version":3,"file":"pricing_info.js","sourceRoot":"","sources":["../../src/utils/pricing_info.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pricing_info.js","sourceRoot":"","sources":["../../src/utils/pricing_info.ts"],"names":[],"mappings":"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"}

package/dist/utils/progress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/utils/progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGtD,qBAAa,eAAe;IACxB,OAAO,CAAC,aAAa,CAAC,CAAkB;IACxC,OAAO,CAAC,gBAAgB,CAAC,CAAwD;IACjF,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,UAAU,CAAC,CAAiB;IACpC,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,eAAe,CAAC,CAAqC;gBAEjD,OAAO,EAAE;QACjB,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAChC,gBAAgB,CAAC,EAAE,CAAC,YAAY,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACzE,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;KACxD;IAOK,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCrD,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAkCtF,IAAI,IAAI,IAAI;CAMf;AAED,wBAAgB,qBAAqB,CACjC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAC1C,gBAAgB,EAAE,CAAC,CAAC,YAAY,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,EACrF,MAAM,CAAC,EAAE,MAAM,EACf,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GACrD,eAAe,GAAG,IAAI,CAOxB"}
+{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/utils/progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGtD,qBAAa,eAAe;IACxB,OAAO,CAAC,aAAa,CAAC,CAAkB;IACxC,OAAO,CAAC,gBAAgB,CAAC,CAAwD;IACjF,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,UAAU,CAAC,CAAiB;IACpC,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,eAAe,CAAC,CAAqC;gBAEjD,OAAO,EAAE;QACjB,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAChC,gBAAgB,CAAC,EAAE,CAAC,YAAY,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACzE,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;KACxD;IAOK,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCrD,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAkCtF,IAAI,IAAI,IAAI;CAMf;AAED,wBAAgB,qBAAqB,CACjC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAC1C,gBAAgB,EAAE,CAAC,CAAC,YAAY,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,EACrF,MAAM,CAAC,EAAE,MAAM,EACf,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GACrD,eAAe,GAAG,IAAI,CAQxB"}

package/dist/utils/progress.js

@@ -1,4 +1,4 @@
-import { PROGRESS_NOTIFICATION_INTERVAL_MS } from '../const.js';
+import { PROGRESS_NOTIFICATION_INTERVAL_MS, RELATED_TASK_META_KEY } from '../const.js';
 export class ProgressTracker {
     constructor(options) {
         Object.defineProperty(this, "progressToken", {
@@ -45,7 +45,7 @@ export class ProgressTracker {
     async updateProgress(message) {
         this.currentProgress += 1;
         // Send progress notification only if progressToken and sendNotification are available
-        if (this.progressToken && this.sendNotification) {
+        if (this.progressToken !== undefined && this.progressToken !== null && this.sendNotification) {
             try {
                 const notification = {
                     method: 'notifications/progress',
@@ -57,7 +57,7 @@ export class ProgressTracker {
                     // Per MCP spec: progress notifications during task execution should include related-task metadata
                     ...(this.taskId && {
                         _meta: {
-                            'io.modelcontextprotocol/related-task': {
+                            [RELATED_TASK_META_KEY]: {
                                 taskId: this.taskId,
                             },
                         },
@@ -117,7 +117,8 @@ export class ProgressTracker {
 }
 export function createProgressTracker(progressToken, sendNotification, taskId, onStatusMessage) {
     // Create tracker if we have either progress notification support or a status message callback
-    if ((!progressToken || !sendNotification) && !onStatusMessage) {
+    const hasProgressNotificationSupport = progressToken !== undefined && progressToken !== null && !!sendNotification;
+    if (!hasProgressNotificationSupport && !onStatusMessage) {
         return null;
     }
     return new ProgressTracker({ progressToken, sendNotification, taskId, onStatusMessage });

package/dist/utils/progress.js.map

@@ -1 +1 @@
-{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/utils/progress.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/utils/progress.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iCAAiC,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEvF,MAAM,OAAO,eAAe;IAQxB,YAAY,OAKX;QAZO;;;;;WAAgC;QAChC;;;;;WAAyE;QACzE;;;;mBAAkB,CAAC;WAAC;QACpB;;;;;WAA4B;QAC5B;;;;;WAAgB;QAChB;;;;;WAAqD;QAQzD,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC3C,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QACjD,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAgB;QACjC,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC;QAE1B,sFAAsF;QACtF,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3F,IAAI,CAAC;gBACD,MAAM,YAAY,GAAyB;oBACvC,MAAM,EAAE,wBAAiC;oBACzC,MAAM,EAAE;wBACJ,aAAa,EAAE,IAAI,CAAC,aAAa;wBACjC,QAAQ,EAAE,IAAI,CAAC,eAAe;wBAC9B,GAAG,CAAC,OAAO,IAAI,EAAE,OAAO,EAAE,CAAC;qBAC9B;oBACD,kGAAkG;oBAClG,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI;wBACf,KAAK,EAAE;4BACH,CAAC,qBAAqB,CAAC,EAAE;gCACrB,MAAM,EAAE,IAAI,CAAC,MAAM;6BACtB;yBACJ;qBACJ,CAAC;iBACL,CAAC;gBAEF,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC9C,CAAC;YAAC,MAAM,CAAC;gBACL,sCAAsC;YAC1C,CAAC;QACL,CAAC;QAED,oDAAoD;QACpD,IAAI,IAAI,CAAC,eAAe,IAAI,OAAO,EAAE,CAAC;YAClC,IAAI,CAAC;gBACD,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YACxC,CAAC;YAAC,MAAM,CAAC;gBACL,sCAAsC;YAC1C,CAAC;QACL,CAAC;IACL,CAAC;IAED,oBAAoB,CAAC,KAAa,EAAE,WAAwB,EAAE,SAAiB;QAC3E,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,iBAAiB,GAAG,EAAE,CAAC;QAE3B,IAAI,CAAC,UAAU,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;YACrC,IAAI,CAAC;gBACD,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;gBAC/C,IAAI,CAAC,GAAG;oBAAE,OAAO;gBAEjB,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC;gBAEtC,4DAA4D;gBAC5D,IAAI,MAAM,KAAK,UAAU,IAAI,aAAa,KAAK,iBAAiB,EAAE,CAAC;oBAC/D,UAAU,GAAG,MAAM,CAAC;oBACpB,iBAAiB,GAAG,aAAa,IAAI,EAAE,CAAC;oBAExC,MAAM,OAAO,GAAG,aAAa;wBACzB,CAAC,CAAC,GAAG,SAAS,KAAK,aAAa,EAAE;wBAClC,CAAC,CAAC,GAAG,SAAS,KAAK,MAAM,EAAE,CAAC;oBAEhC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;oBAEnC,iCAAiC;oBACjC,IAAI,MAAM,KAAK,WAAW,IAAI,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;wBAClG,IAAI,CAAC,IAAI,EAAE,CAAC;oBAChB,CAAC;gBACL,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACL,iCAAiC;YACrC,CAAC;QACL,CAAC,EAAE,iCAAiC,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI;QACA,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC/B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAChC,CAAC;IACL,CAAC;CACJ;AAED,MAAM,UAAU,qBAAqB,CACjC,aAA0C,EAC1C,gBAAqF,EACrF,MAAe,EACf,eAAoD;IAEpD,8FAA8F;IAC9F,MAAM,8BAA8B,GAAG,aAAa,KAAK,SAAS,IAAI,aAAa,KAAK,IAAI,IAAI,CAAC,CAAC,gBAAgB,CAAC;IACnH,IAAI,CAAC,8BAA8B,IAAI,CAAC,eAAe,EAAE,CAAC;QACtD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,IAAI,eAAe,CAAC,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;AAC7F,CAAC"}