earnrate 0.2.11 → 0.2.13

package/dist/engine/wallet-change.js

@@ -4,7 +4,7 @@ import { addMonths } from "./bonus.js";
 import { capByKey } from "./evaluate.js";
 import { choicePeriod, periodKey } from "./periods.js";
 import { knownMemberships, searchCards, setupNotes, } from "./setup.js";
-import { idList } from "./text.js";
+import { CREDIT_PERIODS, idList, money } from "./text.js";
 const failed = (error) => ({ ok: false, error });
 function findCatalogCard(catalog, id, today) {
     const card = catalog.cards.find((c) => c.id === id);
@@ -22,6 +22,8 @@ function isAnniversary(text) {
     const date = new Date(`2024-${text}T00:00:00Z`); // a leap year allows 02-29
     return (!Number.isNaN(date.getTime()) && date.toISOString().slice(5, 10) === text);
 }
+const isDate = (d) => /^\d{4}-\d{2}-\d{2}$/.test(d) &&
+    new Date(`${d}T00:00:00Z`).toISOString().startsWith(d);
 function pickKey(card, today) {
     const period = choicePeriod(card);
     return period === null ? null : periodKey(period, today, null);
@@ -44,6 +46,15 @@ export function cardFields(card, held, input, today) {
         }
         fields.anniversary = input.anniversary;
     }
+    if (input.opened === null)
+        fields.opened = null;
+    else if (input.opened !== undefined) {
+        if (!isDate(input.opened))
+            problems.push(`"${input.opened}" isn't a date. Use YYYY-MM-DD.`);
+        else if (input.opened > today)
+            problems.push("The account's opening date is in the future.");
+        fields.opened = input.opened;
+    }
     if (input.activated !== undefined) {
         const needing = card.rules
             .filter((r) => r.requires?.activation)
@@ -138,12 +149,44 @@ export function cardFields(card, held, input, today) {
         }
         fields.milestone_usage = usage;
     }
+    if (input.enrolled !== undefined) {
+        const needing = card.credits
+            .filter((c) => c.enroll === true)
+            .map((c) => c.id);
+        for (const id of input.enrolled) {
+            if (!needing.includes(id))
+                problems.push(needing.length > 0
+                    ? `'${id}' isn't a ${card.id} credit that needs enrolling. Those are: ${idList(needing)}.`
+                    : `${card.id} has no credits that need enrolling.`);
+        }
+        fields.enrolled = [...new Set(input.enrolled)];
+    }
+    if (input.creditUsed !== undefined) {
+        const usage = { ...held?.credit_usage };
+        const anniversary = fields.anniversary ?? held?.anniversary ?? null;
+        for (const [id, used] of Object.entries(input.creditUsed)) {
+            const credit = card.credits.find((c) => c.id === id);
+            if (!credit) {
+                problems.push(card.credits.length > 0
+                    ? `${card.id} has no credit '${id}'. Its credits are: ${idList(card.credits.map((c) => c.id))}.`
+                    : `${card.id} has no merchant credits.`);
+                continue;
+            }
+            if (!(used >= 0 && used <= credit.amount))
+                problems.push(`The '${id}' credit is ${money(credit.amount)} ${CREDIT_PERIODS[credit.period]}, so what's used must be $0 to ${money(credit.amount)}.`);
+            const period = periodKey(credit.period, today, anniversary);
+            if (period === null) {
+                problems.push(`The '${id}' credit resets on the card's anniversary; give the anniversary (MM-DD) too.`);
+                continue;
+            }
+            usage[id] = { period, used };
+        }
+        fields.credit_usage = usage;
+    }
     if (input.bonus === null)
         fields.bonus = null;
     else if (input.bonus !== undefined) {
         const b = input.bonus;
-        const isDate = (d) => /^\d{4}-\d{2}-\d{2}$/.test(d) &&
-            new Date(`${d}T00:00:00Z`).toISOString().startsWith(d);
         if (!isDate(b.opened))
             problems.push(`"${b.opened}" isn't a date. Use YYYY-MM-DD.`);
         else if (b.opened > today)
@@ -177,6 +220,12 @@ export function cardFields(card, held, input, today) {
             ...(dollars === undefined ? {} : { dollars }),
         };
     }
+    const opened = fields.opened === undefined ? (held?.opened ?? null) : fields.opened;
+    const bonusOpened = fields.bonus === undefined
+        ? (held?.bonus?.opened ?? null)
+        : fields.bonus?.opened;
+    if (opened !== null && bonusOpened != null && opened !== bonusOpened)
+        problems.push(`The card's opening date (${opened}) and its welcome bonus's (${bonusOpened}) differ; give the same date for both.`);
     return problems.length > 0 ? problems.join('\n') : fields;
 }
 const newHolding = (id) => ({
@@ -184,8 +233,10 @@ const newHolding = (id) => ({
     cap_usage: {},
     activated: [],
 });
-const withFields = ({ bonus, checkout_label, ...held }, f) => ({
+const withFields = ({ bonus, checkout_label, opened, ...held }, f) => ({
     ...held,
+    ...(opened !== undefined && f.opened === undefined ? { opened } : {}),
+    ...(f.opened ? { opened: f.opened } : {}),
     ...(bonus && f.bonus === undefined ? { bonus } : {}),
     ...(checkout_label !== undefined && f.checkout_label === undefined
         ? { checkout_label }
@@ -198,6 +249,8 @@ const withFields = ({ bonus, checkout_label, ...held }, f) => ({
     ...(f.milestone_usage === undefined
         ? {}
         : { milestone_usage: f.milestone_usage }),
+    ...(f.enrolled === undefined ? {} : { enrolled: f.enrolled }),
+    ...(f.credit_usage === undefined ? {} : { credit_usage: f.credit_usage }),
     ...(f.bonus ? { bonus: f.bonus } : {}),
 });
 // `wallet` is null when there isn't one yet; adding a card starts it.

package/dist/engine/wallet-summary.js

@@ -1,13 +1,15 @@
 import { bonusStatus } from "./bonus.js";
 import { activationGroup, capUsed, isActivated, pickedCategories, } from "./evaluate.js";
+import { introUntil, introWindows, openedOn } from "./intro.js";
 import { membershipName } from "./memberships.js";
 import { milestoneSummaries } from "./milestones.js";
-import { optionName, ruleParts, ruleWhat } from "./rule-text.js";
+import { creditStates } from "./credits.js";
+import { creditWhere, optionName, ruleParts } from "./rule-text.js";
 import { choicePeriod, daysBetween, inEffect, periodEnd } from "./periods.js";
 import { STALE_AFTER_DAYS } from "./recommend.js";
 import { rotationGap } from "./rotation.js";
 import { activationRules } from "./setup.js";
-import { CAP_PERIODS, choiceName, currencyLabel, earnText, listed, shortDate, wholeDollars, words, } from "./text.js";
+import { CAP_PERIODS, categoryReadsOn, creditBack, creditLeft, ENROLL_FIRST, choiceName, currencyLabel, earnText, listed, PAYMENT_PHRASES, shortDate, wholeDollars, words, } from "./text.js";
 import { cardValuation, currencyValuation } from "./valuation.js";
 const matchKeys = (rule) => rule.match.choice !== undefined
     ? []
@@ -61,10 +63,12 @@ function headlineRates(catalog, wallet, card, held, currency, today) {
         if (replaced)
             continue;
         const pending = r.requires?.activation && !isActivated(card, held, r.id);
+        const payment = r.requires?.payment;
         const key = [
             `${earnText(catalog, r.rate, currency)} on`,
             capLimit(card, shown, r),
             pending ? ', once activated' : '',
+            payment === undefined ? '' : ` ${PAYMENT_PHRASES[payment]}`,
         ].join('|');
         const whats = lines.get(key) ?? [];
         for (const part of ruleParts(catalog, r))
@@ -74,12 +78,13 @@ function headlineRates(catalog, wallet, card, held, currency, today) {
     }
     return [
         ...[...lines].map(([key, whats]) => {
-            const [head = '', limit = '', activate = ''] = key.split('|');
+            const [head = '', limit = '', activate = '', paid = ''] = key.split('|');
             const after = `${limit}${activate}`;
-            return `${head} ${listed(whats)}${after === '' ? '' : ` (${after.replace(/^, /, '')})`}`;
+            return `${head} ${listed(whats)}${paid}${after === '' ? '' : ` (${after.replace(/^, /, '')})`}`;
         }),
         ...(shown.some((r) => r.match.any &&
             r.geography !== 'foreign_only' &&
+            r.requires?.payment === undefined &&
             r.rate > card.base_rate)
             ? []
             : [`${earnText(catalog, card.base_rate, currency)} on everything else`]),
@@ -98,8 +103,13 @@ export function activationsDue(catalog, card, held, today) {
             seen.add(g);
         const rules = card.rules.filter((r) => group.includes(r.id));
         const first = rules[0];
+        const categories = rules.flatMap((r) => r.match.categories ?? []);
+        const servicesOnly = categories.length > 0 &&
+            rules.every((r) => (r.match.merchants ?? []).length === 0) &&
+            categories.every((c) => categoryReadsOn(catalog, c));
         out.push({
-            what: rules.map((r) => ruleWhat(catalog, r)).join(', '),
+            what: listed([...new Set(rules.flatMap((r) => ruleParts(catalog, r)))]),
+            preposition: servicesOnly ? 'on' : 'at',
             from: first?.valid_from ?? null,
             to: first?.valid_to ?? null,
             activateBy: first?.activate_by ?? null,
@@ -144,7 +154,7 @@ function capSummaries(catalog, card, held, today) {
         const shared = card.caps.find((c) => c.id === key);
         const label = shared?.rotating
             ? 'the rotating bonus categories'
-            : [...new Set(covered.map((r) => ruleWhat(catalog, r)))].join(', ') ||
+            : listed([...new Set(covered.flatMap((r) => ruleParts(catalog, r)))]) ||
                 words(key);
         return {
             key,
@@ -194,6 +204,7 @@ export function walletSummary(catalog, wallet, today) {
             rotationGap: rotationGap(card, today),
             caps: capSummaries(catalog, card, held, today),
             milestones: milestoneSummaries(card, held, today),
+            credits: creditSummaries(catalog, card, held, today),
             chosen: held.chosen
                 ? {
                     period: held.chosen.period,
@@ -211,6 +222,8 @@ export function walletSummary(catalog, wallet, today) {
             activated: held.activated,
             toActivate: toActivate(catalog, card, held, today),
             anniversary: held.anniversary ?? null,
+            opened: openedOn(held),
+            intro: introSummary(card, held, today),
         });
     }
     return {
@@ -221,6 +234,41 @@ export function walletSummary(catalog, wallet, today) {
         cards,
     };
 }
+function creditSummaries(catalog, card, held, today) {
+    return creditStates(catalog, card, held, today).map((s) => {
+        const status = !s.enrolled
+            ? `${ENROLL_FIRST}, then mark it enrolled`
+            : s.left === null
+                ? "give the card's anniversary to track it"
+                : `${creditLeft(s.left, s.period)}${s.until === null ? '' : `, through ${shortDate(s.until)}`}`;
+        return {
+            id: s.credit.id,
+            name: s.name,
+            amount: s.amount,
+            period: s.period,
+            enroll: s.credit.enroll === true,
+            enrolled: s.enrolled,
+            currentPeriod: s.key,
+            until: s.until,
+            used: s.used,
+            left: s.left,
+            tracked: held.credit_usage?.[s.credit.id] !== undefined,
+            text: `${creditBack(s)} ${creditWhere(catalog, s.credit)}: ${status}.`,
+        };
+    });
+}
+function introSummary(card, held, today) {
+    const [first] = card.intro_rates;
+    if (!first)
+        return null;
+    const opened = openedOn(held);
+    if (opened === null)
+        return { state: 'no-date', until: null, days: first.days };
+    const [active] = introWindows(card, held, today);
+    if (active)
+        return { state: 'active', until: active.until, days: active.intro.days };
+    return { state: 'ended', until: introUntil(first, opened), days: first.days };
+}
 function pointValues(catalog, wallet) {
     return Object.keys(wallet.valuations)
         .filter((id) => catalog.currencies.some((c) => c.id === id))

package/dist/format/card-art.js

@@ -0,0 +1,21 @@
+const FALLBACK = '#5c5650';
+export function cardColor(catalog, cardId) {
+    const card = catalog.cards.find((c) => c.id === cardId);
+    if (card?.color)
+        return card.color;
+    return catalog.issuers.find((i) => i.id === card?.issuer)?.color ?? FALLBACK;
+}
+// Relative luminance, to keep the chip and edge visible on light cards.
+function light(hex) {
+    const [r, g, b] = [1, 3, 5].map((i) => {
+        const c = parseInt(hex.slice(i, i + 2), 16) / 255;
+        return c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4;
+    });
+    return 0.2126 * r + 0.7152 * g + 0.0722 * b > 0.35;
+}
+// 86 x 54 is a card's 85.6 x 54 mm; `width` scales it.
+export function cardArtSvg(color, width = 48) {
+    const height = Math.round((width * 54) / 86);
+    const edge = light(color) ? 'rgba(0,0,0,0.18)' : 'rgba(255,255,255,0.14)';
+    return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 86 54" width="${String(width)}" height="${String(height)}" aria-hidden="true" focusable="false"><rect x="0.5" y="0.5" width="85" height="53" rx="5" fill="${color}" stroke="${edge}"/><path d="M0 40 L56 0 H80 Q85.5 0 85.5 5 V8 L20 54 H5 Q0 54 0 49 Z" fill="#fff" opacity="0.07"/><rect x="10" y="17" width="14" height="11" rx="2" fill="#d9c08a" stroke="rgba(0,0,0,0.25)" stroke-width="0.6"/><path d="M10 22.5 H24 M17 17 V28" stroke="rgba(0,0,0,0.25)" stroke-width="0.6"/><rect x="10" y="40" width="30" height="3" rx="1.5" fill="${light(color) ? '#000' : '#fff'}" opacity="0.28"/></svg>`;
+}

package/dist/format/card-text.js

@@ -9,11 +9,12 @@ export function cardText(catalog) {
     const cards = new Map(catalog.cards.map((c) => [c.id, c]));
     function shortName(id) {
         const name = cards.get(id)?.name ?? id;
-        return name
+        return (name
             .replace(/^American Express /, 'Amex ')
             .replace(/^The Platinum Card from American Express$/, 'Amex Platinum')
-            .replace(/ (Visa Signature |Visa Infinite )?(Credit )?Card$/, '')
-            .replace(/ Card by /, ' by ');
+            // "Card" is part of Apple Card's name, not a suffix.
+            .replace(/ (Visa Signature |Visa Infinite )?(Credit )?(?<!^Apple )Card$/, '')
+            .replace(/ Card by /, ' by '));
     }
     function feeLabel(id) {
         const card = cards.get(id);

package/dist/format/cards.js

@@ -20,6 +20,7 @@ export function formatCardInfo(card) {
             : []),
         ...(card.needsAnniversary ? ['cap resets on the card anniversary'] : []),
         ...card.milestones.map((m) => `spend bonus: ${m.text} (${m.id})`),
+        ...card.introRates.map((i) => `new accounts: ${i.text}; needs the opening date`),
         ...(card.onlyAt ? [`works only at ${card.onlyAt.join(', ')}`] : []),
         foreignFeeText(card.foreignTransactionFee).toLowerCase(),
     ];

package/dist/format/cheat-sheet.js

@@ -15,5 +15,7 @@ export function formatCheatSheet(sheet) {
     }
     if (sheet.notes.length > 0)
         lines.push('', ...sheet.notes);
+    if (sheet.assumptions.length > 0)
+        lines.push('', ...sheet.assumptions);
     return `${lines.join('\n')}\n`;
 }

package/dist/format/explore.js

@@ -1,5 +1,5 @@
 import { membershipName, membershipNote, } from "../engine/memberships.js";
-import { choiceName, feeText, dollarsAndCents, pct, wholeDollars, words, } from "../engine/text.js";
+import { capitalize, choiceName, CREDIT_GROUP, CREDITS_LEFT_OUT, ENROLL_FIRST, hostname, feeText, dollarsAndCents, pct, wholeDollars, words, } from "../engine/text.js";
 const membershipFees = (memberships) => memberships
     .map((m) => ` + ${wholeDollars(m.annualFee)} for ${m.name}`)
     .join('');
@@ -15,7 +15,23 @@ export function formatExploration(r, catalog, all) {
         return `No cards match at ${title}.\n`;
     const shown = all ? r.ranked : r.ranked.slice(0, TOP_BEST);
     const width = Math.max(...shown.map((e) => e.cardName.length));
-    const lines = [`Best cards for ${title}:`, ''];
+    const lines = [
+        ...(r.credits.length === 0
+            ? []
+            : [
+                `${CREDIT_GROUP} at ${title}:`,
+                '',
+                ...r.credits.flatMap((c) => [
+                    `- ${c.cardName}: ${c.text}${c.enroll ? ` (${ENROLL_FIRST})` : ''}. ${capitalize(feeText(c))}.`,
+                    ...(c.evidence
+                        ? [`    "${c.evidence.quote}" (${hostname(c.evidence.url)})`]
+                        : []),
+                ]),
+                '',
+            ]),
+        `Best cards for ${title}${r.credits.length === 0 ? '' : ' by rate'}:`,
+        '',
+    ];
     shown.forEach((e, i) => {
         const earned = e.earned === null ? '' : `  ${dollarsAndCents(e.earned)}`;
         lines.push(`${String(i + 1).padStart(2)}. ${e.cardName.padEnd(width)}  ${pct(e.effectiveReturnPct).padStart(5)}${earned}  ${feeText(e)}`);
@@ -89,7 +105,7 @@ export function formatCatalogSimulation(r, catalog, all) {
     ]);
     if (notes.size > 0)
         lines.push('', ...notes);
-    lines.push('', "Assumes each card's best picks, activations done each quarter, and no welcome bonuses.");
+    lines.push('', `Assumes each card's best picks, activations done each quarter, and no welcome bonuses. ${CREDITS_LEFT_OUT}`);
     return `${lines.join('\n')}\n`;
 }
 export function formatAdditions(r, catalog, all) {
@@ -117,6 +133,6 @@ export function formatAdditions(r, catalog, all) {
     ]);
     if (notes.size > 0)
         lines.push('', ...notes);
-    lines.push('', 'Assumes your picks carry over, rotating categories get activated, and caps start fresh. Annual fees are counted in full: statement credits and perks that offset them are left out. Each kind of spending lists the card that earns the most on it over the whole year, so a one-quarter bonus may not show.');
+    lines.push('', `Assumes your picks carry over, rotating categories get activated, and caps start fresh. Annual fees are counted in full: statement credits and perks that offset them are left out. ${CREDITS_LEFT_OUT} Each kind of spending lists the card that earns the most on it over the whole year, so a one-quarter bonus may not show.`);
     return `${lines.join('\n')}\n`;
 }

package/dist/format/recommendation.js

@@ -33,7 +33,8 @@ function cardLines(cards, style, bonusPick) {
         const earned = (c.earned === null ? '' : `  ${dollarsAndCents(c.earned)}`) +
             (c.milestoneBonus === null
                 ? ''
-                : ` + ${money(c.milestoneBonus.dollars)} spend bonus`);
+                : ` + ${money(c.milestoneBonus.dollars)} spend bonus`) +
+            (c.credit?.dollars ? ` + ${money(c.credit.dollars)} credit` : '');
         const pick = c.cardId === bonusPick ? '  ← the pick, for its welcome bonus' : '';
         lines.push(`  ${String(c.rank).padStart(String(rankWidth).length)}. ${label(c).padEnd(nameWidth)}  ${pct(c.effectiveReturnPct).padStart(pctWidth)}${earned}${pick}`);
         for (const r of c.reasoning)
@@ -59,9 +60,12 @@ export function formatRecommendation(rec, purchase, { all = false, style = plain
         const milestone = top.milestoneBonus === null
             ? ''
             : `, plus a spend bonus worth about ${money(top.milestoneBonus.dollars)}`;
+        const credit = top.credit?.dollars
+            ? `, plus ${money(top.credit.dollars)} back from its ${top.credit.name} credit`
+            : '';
         const confidence = rec.decision.confidence;
         const why = rec.bonus ? ' for its welcome bonus' : '';
-        lines.push(`${style('bold', `Use ${label(top)}${why}: ${pct(top.effectiveReturnPct)} back${earned}${milestone}.`)} ${capitalize(confidence)} confidence.`);
+        lines.push(`${style('bold', `Use ${label(top)}${why}: ${pct(top.effectiveReturnPct)} back${earned}${milestone}${credit}.`)} ${capitalize(confidence)} confidence.`);
         if (rec.bonus && rec.notes[0])
             lines.push(rec.notes[0]);
     }

package/dist/format/wallet-yaml.js

@@ -19,6 +19,7 @@ function compact(wallet) {
                 ? {}
                 : { checkout_label: c.checkout_label }),
             ...(c.anniversary === undefined ? {} : { anniversary: c.anniversary }),
+            ...(c.opened === undefined ? {} : { opened: c.opened }),
             ...(Object.keys(c.cap_usage).length > 0
                 ? { cap_usage: c.cap_usage }
                 : {}),

package/dist/format/wallet.js

@@ -1,4 +1,4 @@
-import { CAP_PERIODS, money, NETWORK_NAMES, shortDate } from "../engine/text.js";
+import { CAP_PERIODS, introAdjective, introSince, money, NETWORK_NAMES, periodPhrase, roundCents, shortDate, } from "../engine/text.js";
 // "To do now", above the card details; nothing when all's done.
 export function formatChecklist(items) {
     return items.length === 0
@@ -36,11 +36,19 @@ export function formatWalletSummary(summary) {
         for (const cap of c.caps)
             lines.push(cap.remaining === null
                 ? `  Cap on ${cap.label}: ${money(cap.amount)} ${CAP_PERIODS[cap.period]}; give the card's anniversary to track it (cap key ${cap.key}).`
-                : `  Cap on ${cap.label}: ${money(cap.spent)} of ${money(cap.amount)} used ${cap.period === 'cardmember_year' ? 'this cardmember year' : `for ${cap.currentPeriod ?? ''}`}${cap.until === null ? '' : `, through ${shortDate(cap.until)}`} (cap key ${cap.key}).`);
+                : `  Cap on ${cap.label}: ${money(cap.spent)} of ${money(cap.amount)} used ${periodPhrase(cap.period, cap.currentPeriod ?? '')}${cap.until === null ? '' : `, through ${shortDate(cap.until)}`} (cap key ${cap.key}).`);
         for (const m of c.milestones)
             lines.push(`  Spend bonus (${m.id}): ${m.text}`);
+        for (const credit of c.credits)
+            lines.push(`  Credit (${credit.id}): ${credit.text}`);
         if (c.anniversary !== null)
             lines.push(`  Account anniversary: ${c.anniversary}.`);
+        if (c.intro?.state === 'active' && c.intro.until !== null)
+            lines.push(`  Opened ${c.opened ?? ''}: ${introAdjective(c.intro.days)} rates through ${shortDate(c.intro.until)}.`);
+        else if (c.intro?.state === 'no-date')
+            lines.push(`  Has ${introAdjective(c.intro.days)} rates for new accounts; give its opening date if it opened ${introSince(c.intro.days)}.`);
+        else if (c.opened !== null)
+            lines.push(`  Opened ${c.opened}.`);
         const b = c.bonus;
         if (b?.state === 'open' && b.spend !== null)
             lines.push(`  Welcome bonus: ${money(b.spent)} of ${money(b.spend)} spent, due ${b.deadline ?? ''}.`);
@@ -56,11 +64,13 @@ export function formatWalletSummary(summary) {
         : "Point values: earnrate's defaults.";
     return [...cards, memberships, values].join('\n');
 }
-export function formatBooking(amount, cardId, cap, bonus, milestones = []) {
+export function formatBooking(amount, cardId, cap, bonus, milestones = [], credit = null) {
     const messages = [];
+    if (credit)
+        messages.push(`Used ${money(roundCents(credit.after - credit.before))} of ${cardId}'s ${credit.name} credit: ${money(credit.after)} of ${money(credit.amount)} ${periodPhrase(credit.periodKind, credit.period)}, ${money(roundCents(Math.max(0, credit.amount - credit.after)))} left.`);
     if (cap) {
         const left = Math.max(0, cap.capAmount - cap.after);
-        messages.push(`Recorded ${money(amount)} on ${cardId} against "${cap.capKey}": ${money(cap.before)} → ${money(cap.after)} of ${money(cap.capAmount)} for ${cap.period}, ${money(left)} left.`);
+        messages.push(`Recorded ${money(amount)} on ${cardId} against "${cap.capKey}": ${money(cap.before)} → ${money(cap.after)} of ${money(cap.capAmount)} ${periodPhrase(cap.periodKind, cap.period)}, ${money(left)} left.`);
     }
     if (bonus) {
         const left = Math.max(0, bonus.spend - bonus.after);
@@ -74,7 +84,7 @@ export function formatBooking(amount, cardId, cap, bonus, milestones = []) {
         const reached = milestones.filter((m) => m.before < m.spend && m.after >= m.spend);
         const next = milestones.find((m) => m.after < m.spend);
         messages.push([
-            `Spend on ${cardId} this year: ${money(first.after)}.`,
+            `Spend on ${cardId} this ${first.periodKind === 'cardmember_year' ? 'cardmember year' : 'year'}: ${money(first.after)}.`,
             ...reached.map((m) => `That reaches its ${money(m.spend)} spend bonus.`),
             ...(next
                 ? [

package/dist/import/analyze.js

@@ -87,6 +87,7 @@ export function analyzeStatement(catalog, wallet, entries, today, alreadyRecorde
                     cardId: held.id,
                     milestoneId: p.milestone.id,
                     period: p.period,
+                    periodKind: p.milestone.period,
                     spend: p.milestone.spend,
                     before: p.spent,
                     after: p.spent,
@@ -181,8 +182,13 @@ export function analyzeStatement(catalog, wallet, entries, today, alreadyRecorde
             date: line.date,
             country: 'US',
         };
-        const used = recommend(catalog, actual, purchase, merchant).ranked.find((r) => r.cardId === cardId);
-        const top = recommend(catalog, simulated, purchase, merchant).ranked[0];
+        // Past statements don't say which credits were used, so they're left out.
+        const used = recommend(catalog, actual, purchase, merchant, {
+            credits: false,
+        }).ranked.find((r) => r.cardId === cardId);
+        const top = recommend(catalog, simulated, purchase, merchant, {
+            credits: false,
+        }).ranked[0];
         if (!used || !top)
             continue;
         earned += used.earned ?? 0;

package/dist/mcp/inputs.js

@@ -2,6 +2,7 @@ import { z } from 'zod';
 import { ALL_PERSONAL_CARDS } from "../engine/explore.js";
 import { profileText, VALUATION_PROFILES } from "../engine/profiles.js";
 import { knownMemberships } from "../engine/setup.js";
+import { PaymentMethod } from "../schema/card.js";
 import { IsoDate } from "../schema/common.js";
 import { COUNTRY_CODE } from "../schema/common.js";
 export const Merchant = z
@@ -18,6 +19,7 @@ export const CountryInput = z
     .regex(COUNTRY_CODE, 'Use a two-letter country code, like US or FR.')
     .optional()
     .describe('Where the purchase is made, as a two-letter country code (FR, GB, JP). Pass it when the user is paying abroad or in another currency: abroad, cards are ranked after their foreign transaction fees. Default US.');
+export const PaymentInput = PaymentMethod.optional().describe("How the purchase is paid, only when the user says: card (the card itself or its number), apple-pay, google-pay or paypal (PayPal checkout). Optional; omit it when unknown, and never assume Apple Pay. Some rates need one (Apple Card's 2% with Apple Pay, PayPal Cashback's 3% through PayPal checkout), and the answer's assumptions say when paying another way would change the pick.");
 export const CardId = z
     .string()
     .min(1)
@@ -64,6 +66,9 @@ const cardFields = {
         .regex(/^\d{2}-\d{2}$/)
         .optional()
         .describe("The account's anniversary as MM-DD, for cards whose cap resets on it."),
+    opened: IsoDate.nullable()
+        .optional()
+        .describe('Optional: the day the account opened, YYYY-MM-DD. Only for cards with a first-year rate (search_cards lists it), which applies only while a purchase falls in the window; without a date the card is ranked at its standard rates. Ask the user; never guess or assume a card is new. null removes it.'),
     activated: z
         .array(z.string())
         .optional()
@@ -76,6 +81,14 @@ const cardFields = {
         .record(z.string(), z.number().nonnegative())
         .optional()
         .describe('Dollars already spent on the card this year, for its spend milestones (bonuses after a yearly spending total, as search_cards lists them): milestone id → dollars, e.g. {"spend-15k": 9000}. Every purchase on the card counts, so give each milestone the same total. Ask; recorded purchases add to it from then on.'),
+    enrolled: z
+        .array(z.string())
+        .optional()
+        .describe('Merchant credit ids the user has enrolled in with the issuer (search_cards and list_wallet list each card\'s credits, e.g. "lululemon" on Amex Platinum). A credit that needs enrolling counts in answers only once it\'s here. Replaces the current list. Ask; never assume.'),
+    creditUsed: z
+        .record(z.string(), z.number().nonnegative())
+        .optional()
+        .describe('Dollars of a merchant credit already received this period: credit id → dollars, e.g. {"lululemon": 40}. Ask; recorded purchases add to it from then on.'),
     bonus: z
         .object({
         opened: IsoDate.describe('The day the account opened, YYYY-MM-DD.'),

package/dist/mcp/prompts.js

@@ -33,10 +33,15 @@ export function registerPrompts(server, deps, ctx) {
                 .string()
                 .optional()
                 .describe('Where you are paying, if not the U.S.: FR, Japan'),
+            paying: z
+                .string()
+                .optional()
+                .describe('How you are paying, if you know: Apple Pay, PayPal'),
         }),
     }, (args) => {
         const amount = args.amount?.trim() || null;
         const country = args.country?.trim() || null;
+        const paying = args.paying?.trim() || null;
         const call = [
             `merchant ${JSON.stringify(args.store)}`,
             ...(amount === null
@@ -45,8 +50,11 @@ export function registerPrompts(server, deps, ctx) {
             ...(country === null
                 ? []
                 : [`country as the two-letter code for ${JSON.stringify(country)}`]),
+            ...(paying === null
+                ? []
+                : [`payment for paying with ${JSON.stringify(paying)}`]),
         ];
-        return ask(`Which credit card should I use at ${args.store}${amount === null ? '' : ` for ${dollars(amount)}`}${country === null ? '' : ` in ${country}`}?`, [
+        return ask(`Which credit card should I use at ${args.store}${amount === null ? '' : ` for ${dollars(amount)}`}${country === null ? '' : ` in ${country}`}${paying === null ? '' : ` with ${paying}`}?`, [
             `Call earnrate's best_card_for_purchase with ${call.join(', ')}.`,
             `It answers from ${FROM_SAVED_OR_ALL}, so don't ask for their cards first.`,
             'Say which card to use and why, with the assumptions and warnings it gives.',