@blockrun/franklin 3.21.6 → 3.21.7

package/dist/agent/loop.js

@@ -46,7 +46,15 @@ import { createSessionId, appendToSession, updateSessionMeta, pruneOldSessions,
 function replaceHistory(target, replacement) {
     target.splice(0, target.length, ...replacement);
 }
-const EXTERNAL_WALL_FAILURE_PATTERN = /\b(?:401|403|429|5\d{2})\b|\bunauthor|\bforbid|\bWAF\b|\bcloudflare\b|\bfault filter\b|\bblocked\b|\binvalid (?:auth|api|token|key|bearer)\b/i;
+// 400/422 (malformed request / failed param validation) are added alongside
+// 401/403/429/5xx: like an auth wall, retrying the same bad request never
+// recovers — the agent must change its inputs, not hammer the endpoint. Caught
+// 2026-05-20 when a `status=active` 422 (invalid enum, Predexon wants
+// open|closed) spun PredictionMarket to the 50-call HARD_TOOL_CAP because the
+// 422 was neither charged (cost guard idle) nor matched here (wall guard idle).
+// 404 is intentionally excluded — "not found" is a legitimate cue to retry
+// with a different query, not a dead wall.
+const EXTERNAL_WALL_FAILURE_PATTERN = /\b(?:400|401|403|422|429|5\d{2})\b|\bunauthor|\bforbid|\bWAF\b|\bcloudflare\b|\bfault filter\b|\bblocked\b|\binvalid (?:auth|api|token|key|bearer)\b/i;
 export function isExternalWallFailure(toolName, output, isError) {
     if (toolName === 'WebFetch') {
         return isError === true || EXTERNAL_WALL_FAILURE_PATTERN.test(output);

package/dist/tools/prediction.js

@@ -220,6 +220,8 @@ function unwrapList(raw) {
             return obj.results;
         if (Array.isArray(obj.positions))
             return obj.positions;
+        if (Array.isArray(obj.entries))
+            return obj.entries; // leaderboard
     }
     return [];
 }
@@ -229,6 +231,46 @@ function parseWalletsInput(value) {
         .map(w => w.trim())
         .filter(Boolean);
 }
+// Predexon's market-list endpoints (polymarket/markets, kalshi/markets,
+// markets/search) all validate `status` against StatusOption = {open, closed}
+// — verified against openapi-v2.json. Earlier code defaulted Polymarket to
+// `active` (the Polymarket Gamma-API convention), which 422s on Predexon.
+// Normalize the common synonyms so an explicit `active` / `archived` coming
+// from the agent or the user still resolves to a valid value.
+// Polymarket leaderboard `sort_by` enum (openapi-v2.json:
+// realized_pnl | total_pnl | volume | roi | profit_factor | win_rate | trades).
+// Maps the ergonomic values the tool advertises ("pnl | volume | win_rate")
+// — and a few obvious synonyms — onto the real enum. Unknown keys resolve to
+// undefined so the param is omitted and the gateway uses its own default.
+const LEADERBOARD_SORT_ALIASES = {
+    pnl: 'total_pnl',
+    total_pnl: 'total_pnl',
+    realized_pnl: 'realized_pnl',
+    realized: 'realized_pnl',
+    volume: 'volume',
+    roi: 'roi',
+    profit_factor: 'profit_factor',
+    win_rate: 'win_rate',
+    winrate: 'win_rate',
+    trades: 'trades',
+};
+// smartActivity and smart-money both REQUIRE at least one smart-wallet
+// criterion (min_realized_pnl / min_total_pnl / min_roi / …) or Predexon 400s
+// with "At least one smart wallet criterion must be specified" — verified live
+// 2026-05-20. The old code sent none, so both endpoints failed every call.
+// Default to a sensible "smart = profitable" floor; the agent can still pass
+// its own threshold via the `minTotalPnl` input.
+const DEFAULT_SMART_MIN_TOTAL_PNL = 10000;
+function normalizeMarketStatus(status) {
+    if (!status)
+        return status;
+    const s = status.trim().toLowerCase();
+    if (s === 'active' || s === 'open' || s === 'live')
+        return 'open';
+    if (s === 'closed' || s === 'archived' || s === 'resolved' || s === 'inactive')
+        return 'closed';
+    return s;
+}
 /**
  * Pick the first usable string from a list of candidate values.
  *
@@ -286,7 +328,7 @@ async function execute(input, ctx) {
                 // searchPolymarket / searchKalshi; rename on the wire.
                 const raw = await getWithPayment('/v1/pm/markets/search', {
                     q: search,
-                    status,
+                    status: normalizeMarketStatus(status),
                     sort,
                     limit: cappedLimit,
                 }, ctx);
@@ -313,7 +355,7 @@ async function execute(input, ctx) {
                         shown.forEach((m, i) => {
                             const title = pickString(m.title, m.question, m.market, m.event, m.market_slug, m.slug, m.ticker) ?? 'untitled';
                             const id = pickString(m.condition_id, m.ticker, m.id);
-                            const idTag = id ? ` · \`${String(id).slice(0, 18)}…\`` : '';
+                            const idTag = id ? ` · \`${String(id)}\`` : '';
                             const vol = m.volume != null ? ` · vol ${formatUsd(m.volume)}` : '';
                             lines.push(`${i + 1}. ${title}${idTag}${vol}`);
                             totalShown++;
@@ -350,9 +392,15 @@ async function execute(input, ctx) {
             case 'leaderboard': {
                 // Global top-wallet ranking. Cheap ($0.001) — the right answer to
                 // "who's making money on Polymarket" / "who should I follow".
+                // Predexon's param is `sort_by` (enum), NOT `sort` — sending `sort`
+                // is silently ignored, so the ranking never honored the agent's
+                // intent. Map the ergonomic aliases to the real enum values
+                // (verified against openapi-v2.json), drop anything unrecognized so
+                // the gateway falls back to its own default rather than 422-ing.
+                const sortBy = sort ? LEADERBOARD_SORT_ALIASES[sort.trim().toLowerCase()] : undefined;
                 const raw = await getWithPayment('/v1/pm/polymarket/leaderboard', {
                     limit: cappedLimit,
-                    sort,
+                    sort_by: sortBy,
                 }, ctx);
                 const rows = unwrapList(raw);
                 if (rows.length === 0) {
@@ -363,13 +411,18 @@ async function execute(input, ctx) {
                     '',
                 ];
                 rows.forEach((r, i) => {
-                    const wallet = pickString(r.wallet, r.address, r.proxy_wallet, r.proxyWallet) ?? 'unknown';
+                    // Predexon v2 entry: { rank, user, metrics:{ total_pnl, volume,
+                    // win_rate, ... }, ... } — verified live 2026-05-20. P&L/volume/win
+                    // live under `metrics`, the address is `user`; the old flat
+                    // r.pnl / r.wallet reads returned undefined for every row.
+                    const metrics = (r.metrics && typeof r.metrics === 'object' ? r.metrics : {});
+                    const wallet = pickString(r.user, r.wallet, r.address, r.proxy_wallet, r.proxyWallet) ?? 'unknown';
                     const w = wallet.length > 12
                         ? `${wallet.slice(0, 8)}…${wallet.slice(-4)}`
                         : wallet;
-                    const pnl = r.pnl ?? r.realized_pnl ?? r.total_pnl;
-                    const volume = r.volume ?? r.total_volume;
-                    const winRate = r.win_rate ?? r.winRate;
+                    const pnl = metrics.total_pnl ?? metrics.realized_pnl ?? r.pnl ?? r.realized_pnl ?? r.total_pnl;
+                    const volume = metrics.volume ?? r.volume ?? r.total_volume;
+                    const winRate = metrics.win_rate ?? r.win_rate ?? r.winRate;
                     const name = pickString(r.name, r.handle, r.username);
                     const handle = name ? ` (${name})` : '';
                     const parts = [];
@@ -645,9 +698,11 @@ async function execute(input, ctx) {
                 // "Discover markets where high-performing wallets are active right now."
                 // Complements `smartMoney`: this discovers interesting markets across
                 // the venue; smartMoney drills into one condition_id.
+                // Requires a smart-wallet criterion (else 400). `search` is not a
+                // supported param here, so it was silently dropped — removed.
                 const raw = await getWithPayment('/v1/pm/polymarket/markets/smart-activity', {
                     limit: cappedLimit,
-                    search,
+                    min_total_pnl: DEFAULT_SMART_MIN_TOTAL_PNL,
                 }, ctx);
                 const rows = unwrapList(raw);
                 if (rows.length === 0) {
@@ -661,14 +716,20 @@ async function execute(input, ctx) {
                 rows.forEach((r, i) => {
                     const title = pickString(r.question, r.title, r.market, r.event, r.market_slug, r.slug) ?? 'untitled';
                     const cid = pickString(r.condition_id, r.id);
-                    const cidTag = cid ? ` · \`${String(cid).slice(0, 14)}…\`` : '';
-                    const smartCount = r.smart_wallets_count ?? r.wallet_count;
-                    const netFlow = r.net_size ?? r.net_yes_size;
+                    // Full condition_id so the agent can chain into smartMoney.
+                    const cidTag = cid ? ` · \`${String(cid)}\`` : '';
+                    // Predexon v2 fields (verified live): smart_wallet_count (singular),
+                    // smart_volume, net_buyers_pct.
+                    const smartCount = r.smart_wallet_count ?? r.smart_wallets_count ?? r.wallet_count;
+                    const smartVol = r.smart_volume ?? r.net_size ?? r.net_yes_size;
+                    const netBuyersPct = r.net_buyers_pct;
                     const stats = [];
                     if (smartCount != null)
                         stats.push(`${smartCount} smart wallet${smartCount === 1 ? '' : 's'}`);
-                    if (netFlow != null)
-                        stats.push(`net ${formatUsd(netFlow)}`);
+                    if (smartVol != null)
+                        stats.push(`smart vol ${formatUsd(smartVol)}`);
+                    if (netBuyersPct != null)
+                        stats.push(`${formatPct(netBuyersPct, 0)} net buyers`);
                     lines.push(`${i + 1}. **${title}**${cidTag}` + (stats.length > 0 ? `\n   ${stats.join(' · ')}` : ''));
                 });
                 lines.push('', `_$0.005 paid via x402._`);
@@ -681,34 +742,50 @@ async function execute(input, ctx) {
                         isError: true,
                     };
                 }
-                // Per-market drill-down. Official live registry:
-                // /api/v1/pm/polymarket/market/:condition_id/smart-money
+                // Per-market drill-down. Requires a smart-wallet criterion (else 400).
+                // Predexon v2 returns a single `positioning` aggregate (net buyer/
+                // seller counts + smart buy/sell volume + avg prices), NOT buyers/
+                // sellers arrays — verified live 2026-05-20.
                 const path = `/v1/pm/polymarket/market/${encodeURIComponent(conditionId)}/smart-money`;
-                const data = await getWithPayment(path, {}, ctx);
-                const buyers = (data.buyers ?? []).slice(0, 5);
-                const sellers = (data.sellers ?? []).slice(0, 5);
+                const data = await getWithPayment(path, {
+                    min_total_pnl: DEFAULT_SMART_MIN_TOTAL_PNL,
+                }, ctx);
+                const pos = data.positioning;
+                if (!pos || typeof pos !== 'object') {
+                    return { output: `No smart-money positioning recorded for \`${conditionId.slice(0, 14)}…\` yet.` };
+                }
                 const lines = [
-                    `## Smart money — \`${conditionId.slice(0, 14)}…\``,
+                    `## Smart money — ${pos.title ?? `\`${conditionId.slice(0, 14)}…\``}`,
                 ];
-                if (data.net_yes_size != null || data.net_no_size != null) {
-                    lines.push(`**Net flow:** YES ${formatUsd(data.net_yes_size)} / NO ${formatUsd(data.net_no_size)}`);
-                }
-                if (buyers.length > 0) {
-                    lines.push('', '**Top buyers**');
-                    buyers.forEach((b, i) => {
-                        const w = b.wallet ? `${b.wallet.slice(0, 8)}…${b.wallet.slice(-4)}` : 'unknown';
-                        lines.push(`${i + 1}. ${w} — ${formatUsd(b.size)} on ${b.outcome ?? 'unknown side'}`);
-                    });
-                }
-                if (sellers.length > 0) {
-                    lines.push('', '**Top sellers**');
-                    sellers.forEach((s, i) => {
-                        const w = s.wallet ? `${s.wallet.slice(0, 8)}…${s.wallet.slice(-4)}` : 'unknown';
-                        lines.push(`${i + 1}. ${w} — ${formatUsd(s.size)} on ${s.outcome ?? 'unknown side'}`);
-                    });
-                }
-                if (buyers.length === 0 && sellers.length === 0) {
-                    lines.push('No smart-money flow recorded for this market yet.');
+                const head = [];
+                if (pos.smart_wallet_count != null)
+                    head.push(`${pos.smart_wallet_count} smart wallets`);
+                if (pos.net_buyers != null && pos.net_sellers != null)
+                    head.push(`${pos.net_buyers} buyers / ${pos.net_sellers} sellers`);
+                if (pos.net_buyers_pct != null)
+                    head.push(`${formatPct(pos.net_buyers_pct, 0)} net buyers`);
+                if (head.length > 0)
+                    lines.push(head.join(' · '));
+                const flow = [];
+                if (pos.total_smart_buy_volume != null)
+                    flow.push(`buy ${formatUsd(pos.total_smart_buy_volume)}`);
+                if (pos.total_smart_sell_volume != null)
+                    flow.push(`sell ${formatUsd(pos.total_smart_sell_volume)}`);
+                if (pos.avg_smart_buy_price != null)
+                    flow.push(`avg buy ${formatPct(pos.avg_smart_buy_price)}`);
+                if (pos.avg_smart_sell_price != null)
+                    flow.push(`avg sell ${formatPct(pos.avg_smart_sell_price)}`);
+                if (flow.length > 0)
+                    lines.push('', `**Smart flow:** ${flow.join(' · ')}`);
+                if (pos.total_smart_realized_pnl != null || pos.avg_smart_roi != null) {
+                    const perf = [];
+                    if (pos.total_smart_realized_pnl != null)
+                        perf.push(`realized P&L ${formatUsd(pos.total_smart_realized_pnl)}`);
+                    if (pos.avg_smart_roi != null)
+                        perf.push(`avg ROI ${formatPct(pos.avg_smart_roi, 1)}`);
+                    if (pos.avg_smart_win_rate != null)
+                        perf.push(`win ${formatPct(pos.avg_smart_win_rate, 0)}`);
+                    lines.push(`**Smart performance:** ${perf.join(' · ')}`);
                 }
                 lines.push('', `_$0.005 paid via x402._`);
                 return { output: lines.join('\n') };
@@ -716,7 +793,7 @@ async function execute(input, ctx) {
             case 'searchPolymarket': {
                 const raw = await getWithPayment('/v1/pm/polymarket/markets', {
                     search,
-                    status: status ?? 'active',
+                    status: normalizeMarketStatus(status) ?? 'open',
                     sort: sort ?? 'volume',
                     limit: cappedLimit,
                 }, ctx);
@@ -732,13 +809,30 @@ async function execute(input, ctx) {
                     '',
                 ];
                 markets.forEach((m, i) => {
-                    const yesPx = m.outcomes && m.outcome_prices && m.outcomes.length === m.outcome_prices.length
-                        ? m.outcomes.map((o, j) => `${o}=${formatPct(m.outcome_prices[j])}`).join(' / ')
-                        : 'n/a';
-                    const cid = m.condition_id ? ` · condition_id=\`${m.condition_id.slice(0, 14)}…\`` : '';
-                    lines.push(`${i + 1}. **${m.question || m.market_slug || 'untitled'}**${cid}\n` +
-                        `   prices: ${yesPx} · vol: ${formatUsd(m.volume)} · liq: ${formatUsd(m.liquidity)}` +
-                        (m.end_date ? ` · ends ${m.end_date.slice(0, 10)}` : ''));
+                    // Prices: Predexon v2 nests each outcome as {label, price} inside
+                    // `outcomes`. Fall back to the legacy parallel `outcomes[]` (strings)
+                    // + `outcome_prices[]` shape if a gateway version still returns it.
+                    let yesPx = 'n/a';
+                    if (Array.isArray(m.outcomes) && m.outcomes.length > 0 && typeof m.outcomes[0] === 'object') {
+                        const outs = m.outcomes;
+                        const parts = outs
+                            .filter(o => o && o.price != null)
+                            .map(o => `${o.label ?? '?'}=${formatPct(o.price)}`);
+                        if (parts.length > 0)
+                            yesPx = parts.join(' / ');
+                    }
+                    else if (Array.isArray(m.outcomes) && Array.isArray(m.outcome_prices) && m.outcomes.length === m.outcome_prices.length) {
+                        yesPx = m.outcomes.map((o, j) => `${o}=${formatPct(m.outcome_prices[j])}`).join(' / ');
+                    }
+                    const vol = m.total_volume_usd ?? m.volume;
+                    const liq = m.liquidity_usd ?? m.liquidity;
+                    const end = m.end_time ?? m.close_time ?? m.end_date;
+                    // Full condition_id (NOT truncated) — the agent chains it into
+                    // smartMoney; a truncated id 404s. Verified live 2026-05-20.
+                    const cid = m.condition_id ? ` · condition_id=\`${m.condition_id}\`` : '';
+                    lines.push(`${i + 1}. **${m.title || m.question || m.market_slug || 'untitled'}**${cid}\n` +
+                        `   prices: ${yesPx} · vol: ${formatUsd(vol)} · liq: ${formatUsd(liq)}` +
+                        (end ? ` · ends ${String(end).slice(0, 10)}` : ''));
                 });
                 lines.push('', `_$0.001 paid via x402._`);
                 return { output: lines.join('\n') };
@@ -746,7 +840,7 @@ async function execute(input, ctx) {
             case 'searchKalshi': {
                 const raw = await getWithPayment('/v1/pm/kalshi/markets', {
                     search,
-                    status: status ?? 'open',
+                    status: normalizeMarketStatus(status) ?? 'open',
                     sort: sort ?? 'volume',
                     limit: cappedLimit,
                 }, ctx);
@@ -761,14 +855,20 @@ async function execute(input, ctx) {
                     '',
                 ];
                 markets.forEach((m, i) => {
-                    // Kalshi quotes prices in cents (0–100). Surface them as a tight
-                    // bid/ask so the agent can read implied probability at a glance.
-                    const bid = m.yes_bid != null ? `${m.yes_bid}¢` : 'n/a';
-                    const ask = m.yes_ask != null ? `${m.yes_ask}¢` : 'n/a';
+                    // Predexon v2 gives a single `last_price` (0–1 probability), not the
+                    // yes_bid/yes_ask cents this once assumed. Render it as an implied
+                    // YES %; fall back to legacy bid/ask if a gateway version sends them.
+                    let yes = 'n/a';
+                    if (m.last_price != null) {
+                        yes = formatPct(m.last_price);
+                    }
+                    else if (m.yes_bid != null || m.yes_ask != null) {
+                        yes = `${m.yes_bid ?? '?'}¢/${m.yes_ask ?? '?'}¢`;
+                    }
                     const ticker = m.ticker ? ` · ticker=\`${m.ticker}\`` : '';
                     lines.push(`${i + 1}. **${m.title || m.ticker || 'untitled'}**${ticker}\n` +
-                        `   yes ${bid}/${ask} · vol: ${m.volume?.toLocaleString() ?? 'n/a'} · OI: ${m.open_interest?.toLocaleString() ?? 'n/a'}` +
-                        (m.close_time ? ` · closes ${m.close_time.slice(0, 10)}` : ''));
+                        `   yes ${yes} · vol: ${m.volume?.toLocaleString() ?? 'n/a'} · OI: ${m.open_interest?.toLocaleString() ?? 'n/a'}` +
+                        (m.close_time ? ` · closes ${String(m.close_time).slice(0, 10)}` : ''));
                 });
                 lines.push('', `_$0.001 paid via x402._`);
                 return { output: lines.join('\n') };
@@ -787,11 +887,26 @@ async function execute(input, ctx) {
                     '',
                 ];
                 pairs.forEach((p, i) => {
+                    // Venues are nested UPPERCASE sub-objects in Predexon v2. pickString
+                    // walks the sub-object's name keys (title/slug/...), so passing the
+                    // whole `POLYMARKET` / `KALSHI` object resolves the title regardless
+                    // of which name-bearing key is populated. Flat legacy fields are
+                    // passed as fallbacks.
+                    const poly = p.POLYMARKET ?? undefined;
+                    const kalshi = p.KALSHI ?? undefined;
+                    const polyTitle = pickString(poly, p.polymarket_question) ?? '(untitled)';
+                    const kalshiTitle = pickString(kalshi, p.kalshi_title);
+                    const ticker = (kalshi && kalshi.market_ticker) || p.kalshi_ticker;
                     const sim = p.similarity != null ? ` · similarity ${formatPct(p.similarity, 0)}` : '';
-                    lines.push(`${i + 1}. **Polymarket:** ${p.polymarket_question || '(untitled)'}\n` +
-                        `   **Kalshi:** ${p.kalshi_title || '(untitled)'}` +
-                        (p.kalshi_ticker ? ` · ticker=\`${p.kalshi_ticker}\`` : '') +
-                        sim);
+                    lines.push(`${i + 1}. **Polymarket:** ${polyTitle}`);
+                    if (kalshi) {
+                        lines.push(`   **Kalshi:** ${kalshiTitle ?? '(untitled)'}` +
+                            (ticker ? ` · ticker=\`${ticker}\`` : '') +
+                            sim);
+                    }
+                    else {
+                        lines.push(`   _(no Kalshi match)_${sim}`);
+                    }
                 });
                 lines.push('', `_$0.005 paid via x402._`);
                 return { output: lines.join('\n') };
@@ -854,7 +969,7 @@ export const predictionMarketCapability = {
                 },
                 status: {
                     type: 'string',
-                    description: 'Polymarket: active | closed | archived (default active). Kalshi: open | closed (default open). Forwarded to searchAll where supported.',
+                    description: 'Market status filter — Predexon accepts `open` or `closed` for Polymarket, Kalshi, and searchAll alike (default `open`). Synonyms like `active`/`archived` are normalized automatically.',
                 },
                 sort: {
                     type: 'string',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockrun/franklin",
-  "version": "3.21.6",
+  "version": "3.21.7",
   "description": "Franklin Agent — The AI agent with a wallet. Spends USDC autonomously to get real work done. Pay per action, no subscriptions.",
   "type": "module",
   "exports": {