earnrate 0.2.13 → 0.2.14

package/data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 Every change to card rules, merchants, categories or currencies under `data/`. Bump `data/VERSION` (`YYYY.MM.DD`, plus `.N` for a second release on the same day) and add a section here in the same commit. Each row cites the issuer page the new value came from.
 
+## 2026.11.05.1
+
+Welcome offers replacing the four that ended 2026-11-04, read on Amex's pages 2026-11-05; none has an end date now. Discover it's foreign transaction fee, from a Discover page that states it.
+
+| Card                          | Field                     | Was                                                                                       | Now                                               | Sources                                                                                                                                                                                                                                                                                     |
+| ----------------------------- | ------------------------- | ----------------------------------------------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| amex-delta-skymiles-gold      | `welcome_offer`           | as high as 80,000 miles + $250 credit after $3,000 in 6 months, ending 2026-11-04         | as high as 80,000 miles after $2,000 in 6 months  | [1](https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-gold-american-express-card/25330-10-0#offer-terms) · [2](https://www.americanexpress.com/us/credit-cards/card/delta-skymiles-gold-american-express-card/)                                        |
+| amex-delta-skymiles-platinum  | `welcome_offer`           | as high as 90,000 miles + $300 credit after $4,000 in 6 months, ending 2026-11-04         | as high as 90,000 miles after $3,000 in 6 months  | [1](https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-platinum-american-express-card/25330-10-0#offer-terms) · [2](https://www.americanexpress.com/us/credit-cards/card/delta-skymiles-platinum-american-express-card/)                                |
+| amex-delta-skymiles-reserve   | `welcome_offer`           | 50,000 miles + 2 Comfort Flight Certificates after $10,000 in 6 months, ending 2026-11-04 | as high as 125,000 miles after $5,000 in 6 months | [1](https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-reserve-american-express-card/25330-10-0#offer-terms) · [2](https://www.americanexpress.com/us/credit-cards/card/delta-skymiles-reserve-american-express-card/)                                  |
+| amex-marriott-bonvoy-business | `welcome_offer`           | 100,000 points + Free Night Award after $8,000 in 6 months, ending 2026-11-04             | 75,000 points after $6,000 in 6 months            | [1](https://www.americanexpress.com/en-us/credit-cards/apply/terms/business/prospect/marriott-bonvoy-business-american-express-card/45094-9-0#offer-terms) · [2](https://www.americanexpress.com/us/credit-cards/business/business-credit-cards/amex-marriott-bonvoy-business-credit-card/) |
+| discover-it-cash-back         | `foreign_transaction_fee` | unknown                                                                                   | 0 ("Discover® has no foreign transaction fee")    | [1](https://www.discover.com/credit-cards/card-smarts/best-international-travel-credit-card/)                                                                                                                                                                                               |
+
+## 2026.11.05
+
+Wording only; no rates changed. `walmart-plus`, `peloton-membership` and `uber-one` take `preposition: on`, so their credits read "on Walmart+ membership" rather than "at".
+
 ## 2026.11.04.15
 
 Merchant statement credits on every card whose issuer publishes them: 73 new credits on 31 cards, each quoted from the issuer's own pages (read 2026-11-04). With the three already entered, 76 credits on 32 cards. Credits a cardholder must pick a merchant for, ones once every several years, benefits that aren't spending, and the kinds `docs/feature-gaps.md` lists under "Merchant credits the schema can't express" aren't entered. No earn rates changed.

package/data/VERSION

@@ -1 +1 @@
-2026.11.04.15
+2026.11.05.1

package/data/cards/amex-delta-skymiles-gold.yaml

@@ -5,7 +5,7 @@ color: '#c9a24f'
 issuer: amex
 network: amex
 currency: delta-skymiles
-last_verified: 2026-11-03
+last_verified: 2026-11-05
 verified_by: claude
 source_urls:
   - https://www.americanexpress.com/us/credit-cards/card/delta-skymiles-gold-american-express-card/
@@ -17,12 +17,11 @@ first_year_fee: 0
 foreign_transaction_fee: 0
 welcome_offer:
   points: 80000
-  spend: 3000
+  spend: 2000
   months: 6
-  valid_to: 2026-11-04
   varies: true
   not_with: [amex-delta-skymiles-platinum, amex-delta-skymiles-reserve]
-  note: 'The public offer is "as high as" 80,000 bonus miles plus a $250 statement credit, both after the same $3,000 in purchases; Amex shows the exact miles (which may be lower, or no offer) after you apply and before you accept. Amex: "You may not be eligible to receive a welcome offer if you have or have had this Card, the Delta SkyMiles® Platinum American Express Card, the Delta SkyMiles® Reserve American Express Card or previous versions of these Cards." Amex may also decline based on your card history.'
+  note: 'The public offer is "as high as" 80,000 bonus miles; Amex shows the exact miles (which may be lower, or no offer) after you apply and before you accept. Amex: "You may not be eligible for a welcome offer if you have or have had this Card or previous versions of this Card, or if you have or have had the Delta SkyMiles® Platinum American Express Card, the Delta SkyMiles® Reserve American Express Card or previous versions of these Cards." Amex may also decline based on your card history.'
 rules:
   - id: restaurants
     match: { categories: [dining] }
@@ -116,16 +115,16 @@ evidence:
     quote: 'will be $0 for the first year of Card Membership'
   - rule: welcome_offer
     url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-gold-american-express-card/25330-10-0#offer-terms
-    quote: 'As High As 80,000 Bonus Miles + $250 Statement Credit'
+    quote: 'As High As 80,000 Bonus Miles'
   - rule: welcome_offer
     url: https://www.americanexpress.com/us/credit-cards/card/delta-skymiles-gold-american-express-card/
-    quote: 'after you spend $3,000 in purchases on your new Card within the first 6 months'
+    quote: 'after you spend $2,000 in purchases on your new Card within the first 6 months'
   - rule: welcome_offer
     url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-gold-american-express-card/25330-10-0#offer-terms
-    quote: 'Offer ends 11/04/2026 at 11:59pm MST.'
+    quote: 'You can earn these bonus miles after you make $2,000 or more'
   - rule: not_with
     url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-gold-american-express-card/25330-10-0#offer-terms
-    quote: 'if you have or have had this Card, the Delta SkyMiles® Platinum American Express Card'
+    quote: 'if you have or have had the Delta SkyMiles® Platinum American Express Card, the Delta SkyMiles® Reserve American Express Card'
   - rule: foreign_transaction_fee
     url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-gold-american-express-card/25330-10-0#offer-terms
     quote: 'Foreign Transaction None Penalty Fees'

package/data/cards/amex-delta-skymiles-platinum.yaml

@@ -5,7 +5,7 @@ color: '#a9abae'
 issuer: amex
 network: amex
 currency: delta-skymiles
-last_verified: 2026-11-03
+last_verified: 2026-11-05
 verified_by: claude
 source_urls:
   - https://www.americanexpress.com/us/credit-cards/card/delta-skymiles-platinum-american-express-card/
@@ -16,12 +16,11 @@ annual_fee: 350
 foreign_transaction_fee: 0
 welcome_offer:
   points: 90000
-  spend: 4000
+  spend: 3000
   months: 6
-  valid_to: 2026-11-04
   varies: true
   not_with: [amex-delta-skymiles-reserve]
-  note: 'The public offer is "as high as" 90,000 bonus miles plus a $300 statement credit, both after the same $4,000 in purchases; Amex shows the exact miles (which may be lower, or no offer) after you apply and before you accept. Amex: "You may not be eligible to receive a welcome offer if you have or have had this Card, the Delta SkyMiles® Reserve American Express Card or previous versions of these Cards." Amex may also decline based on your card history.'
+  note: 'The public offer is "as high as" 90,000 bonus miles; Amex shows the exact miles (which may be lower, or no offer) after you apply and before you accept. Amex: "You may not be eligible for a welcome offer if you have or have had this Card or previous versions of this Card or if you have or have had the Delta SkyMiles® Reserve American Express Card or previous versions of these Cards." Amex may also decline based on your card history.'
 rules:
   - id: delta
     match: { merchants: [delta, delta-vacations, delta-stays] }
@@ -118,16 +117,16 @@ evidence:
     quote: 'Annual Fee $350 Transaction Fees'
   - rule: welcome_offer
     url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-platinum-american-express-card/25330-10-0#offer-terms
-    quote: 'As High As 90,000 Bonus Miles + Earn $300 Statement Credit'
+    quote: 'As High As 90,000 Bonus Miles'
   - rule: welcome_offer
     url: https://www.americanexpress.com/us/credit-cards/card/delta-skymiles-platinum-american-express-card/
-    quote: 'after you spend $4,000 in purchases on your new Card within the first 6 months'
+    quote: 'after you spend $3,000 in purchases on your new Card within the first 6 months'
   - rule: welcome_offer
     url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-platinum-american-express-card/25330-10-0#offer-terms
-    quote: 'Offer ends 11/04/2026 at 23:59 MST.'
+    quote: 'You can earn these bonus miles after you make $3,000 or more'
   - rule: not_with
     url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-platinum-american-express-card/25330-10-0#offer-terms
-    quote: 'if you have or have had this Card, the Delta SkyMiles® Reserve American Express Card'
+    quote: 'if you have or have had the Delta SkyMiles® Reserve American Express Card or previous versions of these Cards'
   - rule: foreign_transaction_fee
     url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-platinum-american-express-card/25330-10-0#offer-terms
     quote: 'Foreign Transaction None Penalty Fees'

package/data/cards/amex-delta-skymiles-reserve.yaml

@@ -5,7 +5,7 @@ color: '#2b2d33'
 issuer: amex
 network: amex
 currency: delta-skymiles
-last_verified: 2026-11-03
+last_verified: 2026-11-05
 verified_by: claude
 source_urls:
   - https://www.americanexpress.com/us/credit-cards/card/delta-skymiles-reserve-american-express-card/
@@ -14,11 +14,11 @@ base_rate: 1
 annual_fee: 650
 foreign_transaction_fee: 0
 welcome_offer:
-  points: 50000
-  spend: 10000
+  points: 125000
+  spend: 5000
   months: 6
-  valid_to: 2026-11-04
-  note: 'Plus two Delta Comfort Flight Certificates after the same $10,000 in purchases: each is one round trip from the U.S. to the lower 48, Puerto Rico or the U.S. Virgin Islands, booked at least 21 days ahead, with up to $80 in taxes and fees, flown by January 15, 2028. Amex: "You may not be eligible to receive a welcome offer if you have or have had this Card or previous versions of this Card." Amex may also decline based on your card history.'
+  varies: true
+  note: 'The public offer is "as high as" 125,000 bonus miles; Amex shows the exact miles (which may be lower, or no offer) after you apply and before you accept. Amex: "You may not be eligible for a welcome offer if you have or have had this Card or previous versions of this Card." Amex may also decline based on your card history.'
 rules:
   - id: delta
     match: { merchants: [delta, delta-vacations, delta-stays] }
@@ -80,16 +80,16 @@ evidence:
     quote: 'The annual fee for the Delta SkyMiles® Reserve American Express Card is $650.'
   - rule: welcome_offer
     url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-reserve-american-express-card/25330-10-0#offer-terms
-    quote: 'Earn 50,000 Bonus Miles + 2 Delta Comfort Flight Certificates'
+    quote: 'As High As 125,000 Bonus Miles'
   - rule: welcome_offer
     url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-reserve-american-express-card/25330-10-0#offer-terms
-    quote: 'after you make $10,000 or more (the "Threshold Amount") in eligible purchases'
+    quote: 'You can earn these bonus miles after you make $5,000 or more'
   - rule: welcome_offer
     url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-reserve-american-express-card/25330-10-0#offer-terms
     quote: 'within your first 6 months of Card Membership'
   - rule: welcome_offer
-    url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-reserve-american-express-card/25330-10-0#offer-terms
-    quote: 'Offer ends 11/04/2026 at 23:59 MST.'
+    url: https://www.americanexpress.com/us/credit-cards/card/delta-skymiles-reserve-american-express-card/
+    quote: 'after you spend $5,000 in purchases on your new Card within the first 6 months'
   - rule: foreign_transaction_fee
     url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/personal/delta-skymiles-reserve-american-express-card/25330-10-0#offer-terms
     quote: 'Foreign Transaction None Penalty Fees'

package/data/cards/amex-marriott-bonvoy-business.yaml

@@ -6,7 +6,7 @@ issuer: amex
 network: amex
 currency: marriott-bonvoy
 business: true
-last_verified: 2026-11-04
+last_verified: 2026-11-05
 verified_by: claude
 source_urls:
   - https://www.americanexpress.com/us/credit-cards/business/business-credit-cards/amex-marriott-bonvoy-business-credit-card/
@@ -15,11 +15,10 @@ base_rate: 2
 annual_fee: 125
 foreign_transaction_fee: 0
 welcome_offer:
-  points: 100000
-  spend: 8000
+  points: 75000
+  spend: 6000
   months: 6
-  valid_to: 2026-11-04
-  note: 'Plus a Free Night Award (up to 50,000 points), which earnrate does not value. Amex: "You may not be eligible to receive a welcome offer if you have or have had this Card or the Starwood Preferred Guest® Business Credit Card from American Express or previous versions of these Cards," and may also decline based on your card history. Also not available to anyone who had a Marriott business card from Chase in the last 30 days, opened the Marriott Bonvoy Bountiful, Boundless or Bold card from Chase in the last 90 days, or got a new Card Member bonus on one of those Chase cards in the last 24 months.'
+  note: 'Amex: "You may not be eligible to receive a welcome offer if you have or have had this Card or the Starwood Preferred Guest® Business Credit Card from American Express or previous versions of these Cards," and may also decline based on your card history. Also not available to anyone who had a Marriott business card from Chase in the last 30 days, opened the Marriott Bonvoy Bountiful, Boundless or Bold card from Chase in the last 90 days, or got a new Card Member bonus on one of those Chase cards in the last 24 months.'
 rules:
   - id: marriott-hotels
     match: { merchants: [marriott] }
@@ -102,13 +101,13 @@ evidence:
     quote: 'Foreign Transaction None Penalty Fees'
   - rule: welcome_offer
     url: https://www.americanexpress.com/us/credit-cards/business/business-credit-cards/amex-marriott-bonvoy-business-credit-card/
-    quote: 'Earn 100,000 Marriott Bonvoy® Bonus Points and 1 Free Night Award'
+    quote: 'Earn 75,000 Marriott Bonvoy® Bonus Points'
   - rule: welcome_offer
     url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/business/prospect/marriott-bonvoy-business-american-express-card/45094-9-0#offer-terms
-    quote: 'after you spend $8,000 or more (the “Threshold Amount”) in eligible purchases'
+    quote: 'You can earn 75,000 Marriott Bonvoy® bonus points after you complete $6,000 or more'
   - rule: welcome_offer
     url: https://www.americanexpress.com/en-us/credit-cards/apply/terms/business/prospect/marriott-bonvoy-business-american-express-card/45094-9-0#offer-terms
-    quote: 'Offer ends 11/4/2026 at 11:59 PM MST.'
+    quote: 'within your first 6 months of Card Membership'
 todo:
   - The welcome offer ends 11/04/2026; re-check the card page for the next one.
   - The welcome offer's Free Night Award isn't valued; a welcome offer holds only points.

package/data/cards/discover-it-cash-back.yaml

@@ -6,7 +6,7 @@ color: '#e8751a'
 issuer: discover
 network: discover
 currency: cash
-last_verified: 2026-11-03
+last_verified: 2026-11-05
 verified_by: claude
 source_urls:
   - https://www.discover.com/credit-cards/cash-back/it-card/
@@ -18,11 +18,12 @@ source_urls:
   - https://www.discover.com/credit-cards/cash-back/cashback-bonus.html
   # The calendar page's "See our FAQs".
   - https://www.discover.com/credit-cards/card-smarts/using-cashback-bonus/
+  # Discover's travel-card article: the only Discover page that states the
+  # foreign transaction fee (the application terms' fee table has no row).
+  - https://www.discover.com/credit-cards/card-smarts/best-international-travel-credit-card/
 base_rate: 1
 annual_fee: 0
-# No page states it: the application terms' fee table lists no foreign
-# transaction fee row, but nothing says "None".
-foreign_transaction_fee: null
+foreign_transaction_fee: 0
 welcome_offer:
   dollars: 200
   spend: 500
@@ -96,7 +97,6 @@ todo:
   - 'Discover has published only 2026 on its 5% calendar (Oct-Dec 2026 is the last quarter shown). Add 2027 quarters when Discover posts them.'
   - Discover's 5% activation isn't retroactive (5% applies "from 10/1/26 (or the date on which you activate 5%, whichever is later)"), and you can activate until the quarter's last day. The schema's activate_by can't say that purchases before activation earn 1%; it's set to the quarter's last day and the rule notes say so.
   - The card page's and application terms' Cashback Match terms say "through your first 365 days"; the Cashback Bonus page says "your first 12 consecutive billing periods or 365 days, whichever is longer". Modeled as 365 days, the shorter. Cash back is matched only when processed within the period, so a purchase in its last days may post too late; earnrate goes by the purchase date.
-  - Foreign transaction fee isn't stated on any Discover page or in the application terms (their fee table has no foreign transaction row). Left null; confirm with the Cardmember Agreement or Capital One.
   - Discover says 5% purchases "must be made with merchants in the U.S." The application terms put that sentence in the general earning paragraph, so it may also apply to the 1% base and Capital One Travel; only the rotating rules are marked us_only.
   - Amusement parks, tourist attractions, aquariums, zoos, record stores, video rental, pool halls and bowling alleys earn 5% as Q4 2026 entertainment but have no earnrate category. Golf courses, country clubs and collegiate sporting events are excluded but can't be told apart from the entertainment category.
   - Third-party payment accounts and digital wallet transactions may not earn 5% if they don't carry a qualifying MCC. Not modeled.
@@ -162,6 +162,9 @@ evidence:
   - rule: annual_fee
     url: https://disclosures.capitalone.com/disclosure.42300.en-US.html
     quote: 'Annual Fee None.'
+  - rule: foreign_transaction_fee
+    url: https://www.discover.com/credit-cards/card-smarts/best-international-travel-credit-card/
+    quote: 'Discover® has no foreign transaction fee'
   - rule: annual_fee
     url: https://www.discover.com/credit-cards/cash-back/it-card/
     quote: 'No, there is no annual fee for the Discover it Card.'

package/data/merchants/seed.yaml

@@ -748,7 +748,7 @@
 
 # Transit
 - { id: uber, name: Uber, category: transit.rideshare }
-- { id: uber-one, name: Uber One, category: other }
+- { id: uber-one, name: Uber One, category: other, preposition: on }
 - { id: lyft, name: Lyft, category: transit.rideshare }
 - { id: amtrak, name: Amtrak, domains: [amtrak.com], category: transit }
 - {
@@ -3359,11 +3359,13 @@
   name: Walmart+ membership
   aliases: [walmart+, walmart+ membership fee]
   category: other
+  preposition: on
   note: The Walmart+ membership fee, not shopping at Walmart.
 - id: peloton-membership
   name: Peloton membership
   aliases: [peloton all-access, peloton app, peloton app one, peloton strength+]
   category: other
+  preposition: on
   note: A Peloton membership or app subscription, not equipment.
 - id: chatgpt
   name: ChatGPT

package/dist/cli/wallet.js

@@ -192,7 +192,7 @@ export async function runWalletCommand(command, argv, io) {
             return RUNTIME_ERROR;
         }
         const header = result.exact ? '' : 'No card matches every word. Closest:\n';
-        io.stdout(`${header}${result.cards.map(formatCardInfo).join('\n')}\n`);
+        io.stdout(`${header}${result.cards.map((c) => formatCardInfo(catalog, c)).join('\n')}\n`);
         return 0;
     }
     if (command === 'values') {

package/dist/engine/cheat-sheet.js

@@ -6,7 +6,7 @@ import { periodKey } from "./periods.js";
 import { ABROAD, recommend } from "./recommend.js";
 import { checklist } from "./checklist.js";
 import { setupNotes } from "./setup.js";
-import { capitalize, CREDITS_LEFT_OUT, feeText, listed, money, paymentNote, shortDate, } from "./text.js";
+import { capitalize, CREDITS_LEFT_OUT, feeText, listed, money, paymentNote, shortDate, possessive, } from "./text.js";
 // The everyday kinds of purchase: the cheat sheet's rows and the site's
 // quick picks.
 export const EVERYDAY_PURCHASES = [
@@ -82,7 +82,7 @@ export function cheatSheet(catalog, wallet, date, items = EVERYDAY_PURCHASES) {
             ...(near.length > 0 ? [`comes within a point on ${listed(near)}`] : []),
         ];
         return [
-            `Working on ${name}'s welcome bonus: ${money(status.remaining ?? 0)} more by ${shortDate(status.deadline ?? date)}. ${where.length > 0
+            `Working on ${possessive(name)} welcome bonus: ${money(status.remaining ?? 0)} more by ${shortDate(status.deadline ?? date)}. ${where.length > 0
                 ? `It ${where.join(' and ')}, so those are the places to use it.`
                 : 'It trails the listed cards everywhere, so use it on everyday spending only as needed to reach the bonus.'}`,
         ];
@@ -130,7 +130,8 @@ function abroadRow(catalog, wallet, date) {
         country: ABROAD,
     }, merchant, { credits: false });
     const top = rec.decision ? rec.ranked[0] : undefined;
-    const allCharge = rec.ranked.length > 0 && rec.ranked.every((r) => r.foreignFee !== null);
+    const knownFee = (id) => catalog.cards.find((c) => c.id === id)?.foreign_transaction_fee ?? 0;
+    const allCharge = rec.ranked.length > 0 && rec.ranked.every((r) => knownFee(r.cardId) > 0);
     return {
         label: ABROAD_LABEL,
         cardId: top?.cardId ?? null,

package/dist/engine/checklist.js

@@ -1,5 +1,5 @@
 import { currentPeriodEnd, daysBetween } from "./periods.js";
-import { CAP_PERIODS, choiceName, enrollCreditText, introEndsText, listed, money, shortDate, useCreditText, wholeDollars, } from "./text.js";
+import { CAP_PERIODS, choiceName, enrollCreditText, introEndsText, listed, money, shortDate, useCreditText, wholeDollars, possessive, } from "./text.js";
 import { milestonePays } from "./milestones.js";
 import { optionName } from "./rule-text.js";
 import { activationsDue, walletSummary, } from "./wallet-summary.js";
@@ -24,7 +24,7 @@ shortName) {
             items.push({
                 kind: 'activate',
                 cardId: card.id,
-                text: `Activate ${name}'s bonus ${a.preposition} ${a.what}${a.activateBy === null ? '' : ` by ${shortDate(a.activateBy)}`}${starts}.`,
+                text: `Activate ${possessive(name)} bonus ${a.preposition} ${a.what}${a.activateBy === null ? '' : ` by ${shortDate(a.activateBy)}`}${starts}.`,
                 due: a.activateBy ?? (a.from !== null && a.from > today ? a.from : a.to),
             });
         }
@@ -41,7 +41,7 @@ shortName) {
             items.push({
                 kind: 'pick',
                 cardId: card.id,
-                text: `Pick ${name}'s ${listed(unpicked.map((c) => choiceName(c.id)))} categories for this ${first.period.replace('_', ' ')}; until then they earn the base rate.`,
+                text: `Pick ${possessive(name)} ${listed(unpicked.map((c) => choiceName(c.id)))} categories for this ${first.period.replace('_', ' ')}; until then they earn the base rate.`,
                 due,
             });
         }
@@ -56,7 +56,7 @@ shortName) {
                 items.push({
                     kind: 'pick',
                     cardId: card.id,
-                    text: `Pick ${name}'s categories for next ${ending.period.replace('_', ' ')}; this one ends ${shortDate(end)}.`,
+                    text: `Pick ${possessive(name)} categories for next ${ending.period.replace('_', ' ')}; this one ends ${shortDate(end)}.`,
                     due: end,
                 });
         }
@@ -66,7 +66,7 @@ shortName) {
             items.push({
                 kind: 'pick',
                 cardId: card.id,
-                text: `${name}'s ${listed(assumed.map((c) => choiceName(c.id)))} pick is assumed to be ${listed(assumed.flatMap((c) => (c.default ?? []).map((o) => optionName(catalog, card, c.id, o))))}; set it if you picked something else.`,
+                text: `${possessive(name)} ${listed(assumed.map((c) => choiceName(c.id)))} pick is assumed to be ${listed(assumed.flatMap((c) => (c.default ?? []).map((o) => optionName(catalog, card, c.id, o))))}; set it if you picked something else.`,
                 due: null,
             });
         for (const cap of s.caps) {
@@ -78,7 +78,7 @@ shortName) {
                 kind: 'cap',
                 cardId: card.id,
                 text: cap.remaining === 0
-                    ? `${name}'s ${cap.label} cap is used up${resets === null ? '' : ` until ${shortDate(resets)}`}; another card may earn more there.`
+                    ? `${possessive(name)} ${cap.label} cap is used up${resets === null ? '' : ` until ${shortDate(resets)}`}; another card may earn more there.`
                     : `${name}: ${money(cap.remaining)} left of ${money(cap.amount)} ${CAP_PERIODS[cap.period]} at the bonus rate on ${cap.label}.`,
                 due: resets,
             });
@@ -94,18 +94,21 @@ shortName) {
                 due: m.until,
             });
         }
+        const toEnroll = s.credits.filter((c) => !c.enrolled);
+        if (toEnroll.length > 0)
+            items.push({
+                kind: 'enroll',
+                cardId: card.id,
+                ref: toEnroll.map((c) => c.id).join(','),
+                text: enrollCreditText(name, toEnroll.map((c) => c.name)),
+                due: null,
+            });
         for (const c of s.credits) {
             if (!c.enrolled)
-                items.push({
-                    kind: 'enroll',
-                    cardId: card.id,
-                    ref: c.id,
-                    text: enrollCreditText(name, c.name),
-                    due: null,
-                });
+                continue;
             // One that needs no enrolling shows once the cardholder uses it, so a
             // card's every credit isn't a to-do for someone who never shops there.
-            else if (c.left !== null && c.left > 0 && (c.enroll || c.tracked))
+            if (c.left !== null && c.left > 0 && (c.enroll || c.tracked))
                 items.push({
                     kind: 'credit',
                     cardId: card.id,
@@ -120,7 +123,7 @@ shortName) {
             items.push({
                 kind: 'bonus',
                 cardId: card.id,
-                text: `${name}'s welcome bonus: ${money(b.remaining)} to go by ${shortDate(b.deadline)}, about ${wholeDollars(b.remaining / weeks)} a week.`,
+                text: `${possessive(name)} welcome bonus: ${money(b.remaining)} to go by ${shortDate(b.deadline)}, about ${wholeDollars(b.remaining / weeks)} a week.`,
                 due: b.deadline,
             });
         }
@@ -139,7 +142,7 @@ shortName) {
             items.push({
                 kind: 'rotation',
                 cardId: card.id,
-                text: `${name}'s ${s.rotationGap} categories aren't out yet; earnrate adds them once the issuer posts them.`,
+                text: `${possessive(name)} ${s.rotationGap} categories aren't out yet; earnrate adds them once the issuer posts them.`,
                 due: null,
             });
         }

package/dist/engine/explore.js

@@ -4,7 +4,7 @@ import { evaluateCard, paymentUpgrade, purchaseContext } from "./evaluate.js";
 import { creditName } from "./rule-text.js";
 import { membershipName, membershipNeeded, paidMemberships, } from "./memberships.js";
 import { choicePeriod, periodKey } from "./periods.js";
-import { FOREIGN_ASSUMPTION, isForeign, recommend } from "./recommend.js";
+import { FOREIGN_ASSUMPTION, foreignFeeFor, isForeign, recommend, } from "./recommend.js";
 import { rotationGap } from "./rotation.js";
 import { membershipsUsed } from "./setup.js";
 import { optionName } from "./rule-text.js";
@@ -131,7 +131,7 @@ function membershipUpgrades(catalog, card, held, merchant, purchase, options, cu
             memberships: [...options.memberships, membership],
         });
         const ctx = purchaseContext(catalog, wallet, merchant, merchant.category, purchase);
-        const fee = isForeign(purchase) ? (card.foreign_transaction_fee ?? 0) : 0;
+        const fee = foreignFeeFor(card, purchase);
         const pct = evaluateCard(card, held, ctx).best.rate *
             cardValuation(catalog, wallet, card).centsPerUnit -
             fee;

package/dist/engine/recommend.js

@@ -1,7 +1,7 @@
 import { findMerchant, merchantFamily, resolveMerchant, resolveMerchantById, } from "../merchants/resolve.js";
 import { bonusStatus } from "./bonus.js";
 import { evaluateCard, paymentUpgrade, purchaseContext, usableAt, } from "./evaluate.js";
-import { openedOn } from "./intro.js";
+import { introWindows, openedOn, withIntro } from "./intro.js";
 import { membershipName } from "./memberships.js";
 import { milestonePoints, milestonesReached, reachedText, } from "./milestones.js";
 import { daysBetween } from "./periods.js";
@@ -9,12 +9,18 @@ import { creditAt, creditDollars } from "./credits.js";
 import { ruleWhat } from "./rule-text.js";
 import { rotationGap } from "./rotation.js";
 import { EPSILON, isClose } from "./compare.js";
-import { CAP_ADJECTIVES, categoryPhrase, creditAnswerText, codesAs, currencyLabel, currencyName, earnText, introRateText, introUnknownText, listed, money, NETWORK_NAMES, num, paidText, paymentUnknownText, pct, pointValuesText, roundCents, shortDate, wholeDollars, } from "./text.js";
+import { CAP_ADJECTIVES, categoryPhrase, creditAnswerText, codesAs, currencyLabel, currencyName, earnText, introRateText, introUnknownText, listed, money, NETWORK_NAMES, num, paidText, paymentUnknownText, pct, pointValuesText, roundCents, shortDate, wholeDollars, possessive, } from "./text.js";
 import { cardValuation } from "./valuation.js";
 export const STALE_AFTER_DAYS = 180;
 // The engine only tells the U.S. from everywhere else.
 export const FOREIGN_ASSUMPTION = 'Treats this as a purchase outside the U.S.: each card is ranked after its foreign transaction fee.';
 export const isForeign = (purchase) => purchase.country !== 'US';
+// A fee that isn't on file counts as the usual 3%, so a card can't win
+// abroad on a guess that it charges none.
+export const ASSUMED_FOREIGN_FEE = 3;
+export const foreignFeeFor = (card, purchase) => isForeign(purchase)
+    ? (card.foreign_transaction_fee ?? ASSUMED_FOREIGN_FEE)
+    : 0;
 // Any purchase outside the U.S., when no country is named: ZZ is a code ISO
 // leaves unassigned, and nothing prints it.
 export const ABROAD = 'ZZ';
@@ -79,8 +85,7 @@ function rankEntries(catalog, wallet, purchase, merchant, category, options = {}
         const bonusPoints = milestonePoints(milestones);
         const perDollar = evaluation.best.rate +
             (bonusPoints > 0 && purchase.amount ? bonusPoints / purchase.amount : 0);
-        // An unknown fee isn't guessed: it's warned about instead.
-        const fee = isForeign(purchase) ? (card.foreign_transaction_fee ?? 0) : 0;
+        const fee = foreignFeeFor(card, purchase);
         const fresh = card.intro_rates.length > 0 && openedOn(held) === null
             ? evaluateCard(card, { ...held, opened: purchase.date }, ctx).best
             : null;
@@ -138,18 +143,19 @@ function reasoningFor(catalog, wallet, entry, amount) {
     const { best } = evaluation;
     const lines = [];
     const currency = valuation.currency;
+    // The standard rate first; a first-year rate on top of it is its own line.
+    // The intro's terms stay in search_cards, not in every answer.
+    const [intro] = best.intro;
+    const standard = earnText(catalog, intro ? best.standardRate : best.nominalRate, currency);
     if (best.rule) {
         const note = best.rule.note ? ` ${best.rule.note}` : '';
-        lines.push(`${earnText(catalog, best.nominalRate, currency)} on ${ruleWhat(catalog, best.rule)}${best.rule.requires?.membership === undefined ? '' : `, with ${membershipName(catalog, best.rule.requires.membership)}`}.${note}`);
+        lines.push(`${standard} on ${ruleWhat(catalog, best.rule)}${best.rule.requires?.membership === undefined ? '' : `, with ${membershipName(catalog, best.rule.requires.membership)}`}.${note}`);
     }
     else {
-        lines.push(`${earnText(catalog, best.nominalRate, currency)}, its base rate. No bonus category applies here.`);
-    }
-    const [intro] = best.intro;
-    if (intro) {
-        const note = intro.intro.note ? ` ${intro.intro.note}` : '';
-        lines.push(`${introRateText(earnText(catalog, best.nominalRate, currency), earnText(catalog, best.standardRate, currency), intro.intro.days, intro.until)}${note}`);
+        lines.push(`${standard}, its base rate. No bonus category applies here.`);
     }
+    if (intro)
+        lines.push(introRateText(earnText(catalog, best.nominalRate, currency), standard, intro.intro.days, intro.until));
     const cap = best.cap;
     if (cap && amount !== null && amount > cap.remaining) {
         const over = amount - cap.remaining;
@@ -177,10 +183,10 @@ function warningsFor(catalog, entry, purchase) {
     const { card, valuation, evaluation } = entry;
     const { best, nominal } = evaluation;
     const warnings = [];
-    if (entry.fee > 0)
-        warnings.push(`Charges a ${pct(entry.fee)} foreign transaction fee here, so it nets ${pct(entry.rateReturnPct)}.`);
     if (isForeign(purchase) && card.foreign_transaction_fee === null)
-        warnings.push("Its foreign transaction fee isn't on file, so none is subtracted. Check the issuer's terms before using it abroad.");
+        warnings.push(`Its foreign transaction fee isn't on file, so earnrate assumes the usual ${pct(entry.fee)} and it nets ${pct(entry.rateReturnPct)}. Check the issuer's terms before using it abroad.`);
+    else if (entry.fee > 0)
+        warnings.push(`Charges a ${pct(entry.fee)} foreign transaction fee here, so it nets ${pct(entry.rateReturnPct)}.`);
     const capLabel = (e) => e.cap
         ? `${money(e.cap.cap.amount)} ${CAP_ADJECTIVES[e.cap.cap.period]} cap`
         : '';
@@ -212,12 +218,14 @@ function warningsFor(catalog, entry, purchase) {
     if (evaluation.staleChoice !== null) {
         warnings.push(`Your chosen categories are set for ${evaluation.staleChoice}, not the current period, so chosen-category bonuses don't apply until you update them.`);
     }
+    const windows = introWindows(card, entry.held, purchase.date);
     for (const rule of evaluation.needsActivation) {
+        const rate = earnText(catalog, withIntro(rule.rate, rule.id, windows), valuation.currency);
         if (rule.activate_by !== undefined && rule.activate_by < purchase.date) {
-            warnings.push(`The bonus here (${earnText(catalog, rule.rate, valuation.currency)}) needed activating by ${shortDate(rule.activate_by)}.`);
+            warnings.push(`The bonus here (${rate}) needed activating by ${shortDate(rule.activate_by)}.`);
             continue;
         }
-        warnings.push(`Activate this bonus with the issuer (it's free)${rule.activate_by === undefined ? '' : ` by ${shortDate(rule.activate_by)}`} to earn ${earnText(catalog, rule.rate, valuation.currency)} here${rule.valid_to === undefined ? '' : ` through ${shortDate(rule.valid_to)}`}.`);
+        warnings.push(`Activate this bonus with the issuer (it's free)${rule.activate_by === undefined ? '' : ` by ${shortDate(rule.activate_by)}`} to earn ${rate} here${rule.valid_to === undefined ? '' : ` through ${shortDate(rule.valid_to)}`}.`);
     }
     return warnings;
 }
@@ -389,9 +397,12 @@ export function recommend(catalog, wallet, purchase, merchant = resolveMerchant(
     const winner = entries[0];
     const warnings = [];
     const notes = [];
-    const charging = entries.filter((e) => e.fee > 0);
+    const charging = entries.filter((e) => e.fee > 0 && e.card.foreign_transaction_fee !== null);
+    const assumed = entries.filter((e) => e.fee > 0 && e.card.foreign_transaction_fee === null);
     if (charging.length > 0 && entries.length > 1)
         notes.push(`${listed(charging.map((e) => `${displayName(e)} (${pct(e.fee)})`))} ${charging.length === 1 ? 'charges a foreign transaction fee' : 'charge foreign transaction fees'} here, already subtracted in the ranking.`);
+    if (assumed.length > 0 && entries.length > 1)
+        notes.push(`${listed(assumed.map(displayName))} ${assumed.length === 1 ? 'has' : 'have'} no foreign transaction fee on file, so the usual ${pct(ASSUMED_FOREIGN_FEE)} is subtracted.`);
     if (merchant.source === 'none') {
         warnings.push(`Couldn't identify "${merchant.input}", so only base rates apply. If you know what kind of business it is, give its category (like dining or grocery) to find bonus rates.`);
     }
@@ -453,7 +464,7 @@ export function recommend(catalog, wallet, purchase, merchant = resolveMerchant(
         const gap = card ? rotationGap(card, purchase.date) : null;
         if (card && gap !== null) {
             const name = held.checkout_label ?? card.name;
-            warnings.push(`${name}'s rotating categories for ${gap} aren't in earnrate's data yet, so it's ranked without them. If this purchase is in that period's categories, ${name} may earn more. An earnrate update adds them once the issuer announces them.`);
+            warnings.push(`${possessive(name)} rotating categories for ${gap} aren't in earnrate's data yet, so it's ranked without them. If this purchase is in that period's categories, ${name} may earn more. An earnrate update adds them once the issuer announces them.`);
         }
     }
     for (const id of merchant.bookedVia) {
@@ -516,7 +527,7 @@ export function recommend(catalog, wallet, purchase, merchant = resolveMerchant(
         const worth = status.value === null ? '' : `, worth about ${wholeDollars(status.value)}`;
         notes.unshift(ties
             ? `${displayName(bonus.entry)} earns as much here as any of your cards, so it's the pick: it helps its welcome bonus, ${money(remaining)} more to spend by ${deadline}${worth}.`
-            : `You're behind pace on ${displayName(bonus.entry)}'s welcome bonus: ${money(remaining)} more to spend by ${deadline}${pace}${worth}.${isBest
+            : `You're behind pace on ${possessive(displayName(bonus.entry))} welcome bonus: ${money(remaining)} more to spend by ${deadline}${pace}${worth}.${isBest
                 ? ''
                 : costHere === null
                     ? ` It earns ${pct(top.effectiveReturnPct)} here against ${pct(first.effectiveReturnPct)} on ${displayName(entries[0] ?? bonus.entry)}, which the bonus outweighs.`

package/dist/engine/record.js

@@ -96,6 +96,7 @@ export function milestoneBookings(catalog, wallet, purchase) {
                 spend: p.milestone.spend,
                 before: p.spent,
                 after: roundCents(Math.max(0, p.spent + purchase.amount)),
+                started: !p.tracked,
             },
         ]);
 }

package/dist/engine/rotation.js

@@ -1,4 +1,5 @@
 import { periodKey } from "./periods.js";
+import { possessive } from "./text.js";
 // The period of the card's rotating categories that `date` falls in, when no
 // rule in the data covers it yet; null when it's covered or the card doesn't
 // rotate.
@@ -16,4 +17,4 @@ export function rotationGap(card, date) {
 }
 // What answers say about a gap: "Freedom Flex's rotating categories for
 // 2027-Q2 aren't in earnrate's data yet. ..."
-export const rotationGapText = (name, gap) => `${name}'s rotating categories for ${gap} aren't in earnrate's data yet. An earnrate update adds them once the issuer announces them.`;
+export const rotationGapText = (name, gap) => `${possessive(name)} rotating categories for ${gap} aren't in earnrate's data yet. An earnrate update adds them once the issuer announces them.`;

package/dist/engine/rule-text.js

@@ -3,13 +3,12 @@ import { categoryPhrase, categoryReadsOn, choiceName, earnText, introPeriod, lis
 // What a rule or a pick covers, in words, for answers and wallet lists.
 // Travel-site bookings ("Flight through Amex Travel") read mid-sentence in
 // lower case and plural; brand names ("Airbnb through Amex Travel") keep theirs.
-const BOOKING = /^(Attraction|Car rental|Cruise|Flight|Hotel|Vacation rental)\b/;
+const BOOKING = /^(Activity|Attraction|Car rental|Cruise|Flight|Hotel|Vacation rental)\b/;
+const plural = (kind) => kind === 'Activity' ? 'activities' : `${kind.toLowerCase()}s`;
 function merchantName(catalog, id) {
     const merchant = findMerchant(catalog, id);
     const name = merchant?.name ?? words(id);
-    return merchant?.kind === 'booking'
-        ? name.replace(BOOKING, (kind) => `${kind.toLowerCase()}s`)
-        : name;
+    return merchant?.kind === 'booking' ? name.replace(BOOKING, plural) : name;
 }
 export function optionName(catalog, card, choiceId, option) {
     const o = card.choices.find((c) => c.id === choiceId)?.options[option];
@@ -76,9 +75,27 @@ export function introWhat(catalog, card, intro) {
     return `${change} for the ${introPeriod(intro.days)}`;
 }
 // What a merchant credit is named for: "Lululemon", "Disney+, Hulu and ESPN".
-export const creditName = (catalog, credit) => listed([
-    ...(credit.match.merchants ?? []).map((m) => merchantName(catalog, m)),
-    ...(credit.match.categories ?? []).map((c) => categoryPhrase(catalog, c)),
-]);
-// "at Lululemon", "at restaurants", "on travel": a category's own preposition.
-export const creditWhere = (catalog, credit) => `${(credit.match.categories ?? []).some((c) => categoryReadsOn(catalog, c)) ? 'on' : 'at'} ${creditName(catalog, credit)}`;
+// Bookings through a travel site the credit also names go without saying:
+// "Capital One Travel", not each kind of booking through it.
+export function creditName(catalog, credit) {
+    const ids = credit.match.merchants ?? [];
+    const portals = ids
+        .map((m) => findMerchant(catalog, m))
+        .filter((m) => m?.kind === 'portal')
+        .map((m) => ` through ${m?.name ?? ''}`);
+    const merchants = ids.filter((m) => {
+        const merchant = findMerchant(catalog, m);
+        return !(merchant?.kind === 'booking' &&
+            portals.some((p) => merchant.name.endsWith(p)));
+    });
+    return listed([
+        ...merchants.map((m) => merchantName(catalog, m)),
+        ...(credit.match.categories ?? []).map((c) => categoryPhrase(catalog, c)),
+    ]);
+}
+// "at Lululemon", "at restaurants", "on travel", "on Walmart+ membership":
+// the category's or merchant's own preposition.
+export const creditWhere = (catalog, credit) => `${(credit.match.categories ?? []).some((c) => categoryReadsOn(catalog, c)) ||
+    (credit.match.merchants ?? []).some((m) => findMerchant(catalog, m)?.preposition === 'on')
+    ? 'on'
+    : 'at'} ${creditName(catalog, credit)}`;

package/dist/engine/setup.js

@@ -4,7 +4,7 @@ import { milestoneWhat } from "./milestones.js";
 import { daysBetween } from "./periods.js";
 import { rotationGap, rotationGapText } from "./rotation.js";
 import { creditName, creditWhere, introWhat } from "./rule-text.js";
-import { creditBack, ENROLL_FIRST, idList, listed } from "./text.js";
+import { creditBack, ENROLL_FIRST, idList, listed, possessive } from "./text.js";
 // Rules that start within this many days are worth activating now.
 const ACTIVATION_LOOKAHEAD_DAYS = 45;
 const searchWords = (s) => s
@@ -168,7 +168,7 @@ export function setupNotes(catalog, wallet, held, today) {
         notes.push({
             kind: 'pick',
             text: choice.default && picked.has(choice.id)
-                ? `${name}'s ${choice.id} pick is assumed to be ${idList(choice.default)}, the default. Set it if a different one was picked (${String(choice.pick)} of: ${options}).`
+                ? `${possessive(name)} ${choice.id} pick is assumed to be ${idList(choice.default)}, the default. Set it if a different one was picked (${String(choice.pick)} of: ${options}).`
                 : `${name} needs its ${choice.id} pick for this period (${String(choice.pick)} of: ${options}). Until then those categories earn the base rate.`,
         });
     }
@@ -177,7 +177,7 @@ export function setupNotes(catalog, wallet, held, today) {
     if (missing.length > 0) {
         notes.push({
             kind: 'membership',
-            text: `Some of ${name}'s rates need ${listed(missing.map((m) => `${membershipName(catalog, m)} (${m})`), 'or')}; they're counted without it.`,
+            text: `Some of ${possessive(name)} rates need ${listed(missing.map((m) => `${membershipName(catalog, m)} (${m})`), 'or')}; they're counted without it.`,
         });
     }
     const toActivate = activationRules(card, today).filter((id) => !isActivated(card, held, id));

package/dist/engine/simulate.js

@@ -6,7 +6,7 @@ import { choicePeriod, periodKey } from "./periods.js";
 import { applyBooking, capBooking } from "./record.js";
 import { milestoneWhat } from "./milestones.js";
 import { rotationGap } from "./rotation.js";
-import { money, paymentNote, roundCents, wholeDollars } from "./text.js";
+import { money, paymentNote, roundCents, wholeDollars, possessive, } from "./text.js";
 import { cardValuation } from "./valuation.js";
 import { EPSILON, HALF_CENT } from "./compare.js";
 const MONTHS = 12;
@@ -164,13 +164,13 @@ held = []) {
             ...new Set(dates.map((d) => rotationGap(card, d)).filter((g) => g !== null)),
         ];
         if (gaps.length > 0)
-            notes.push(`${card.name}'s rotating categories for ${gaps.join(', ')} aren't in earnrate's data yet, so those quarters count at its everyday rates.`);
+            notes.push(`${possessive(card.name)} rotating categories for ${gaps.join(', ')} aren't in earnrate's data yet, so those quarters count at its everyday rates.`);
         if (card.annual_fee === undefined)
-            notes.push(`${card.name}'s annual fee isn't on file, so none is subtracted.`);
+            notes.push(`${possessive(card.name)} annual fee isn't on file, so none is subtracted.`);
         else if (!held.includes(card.id) &&
             card.first_year_fee !== undefined &&
             card.first_year_fee !== card.annual_fee)
-            notes.push(`${card.name}'s fee is ${money(card.first_year_fee)} the first year; the yearly figure uses the ${money(card.annual_fee)} that follows.`);
+            notes.push(`${possessive(card.name)} fee is ${money(card.first_year_fee)} the first year; the yearly figure uses the ${money(card.annual_fee)} that follows.`);
     }
     return {
         cards: wallet.cards.map((h) => ({

package/dist/engine/text.js

@@ -129,6 +129,8 @@ export function paymentNote(cards) {
 }
 // A name with its own "and" ("drugstores and pharmacies") would run into the
 // list's: those lists use commas only, with those names last.
+// "Amex Platinum's", "Capital One Savor Rewards'".
+export const possessive = (name) => name.endsWith('s') ? `${name}'` : `${name}'s`;
 export const listed = (parts, joiner = 'and') => {
     const anded = parts.filter((p) => p.includes(' and '));
     if (anded.length > 0)
@@ -187,7 +189,7 @@ export const introSince = (days) => days === 365 ? 'in the last year' : `in the
 export const introRateText = (earn, standard, days, until) => `${earn} in your ${introPeriod(days)}, through ${shortDate(until)}; ${standard} after that.`;
 // For a card whose opening date isn't known: it's never assumed to be new.
 export const introUnknownText = (name, earn, standard, days) => `A ${introAdjective(days)} rate may apply on ${name}: ${earn} here in an account's ${introPeriod(days)}, instead of the ${standard} it's ranked at. Give the card's opening date if it opened ${introSince(days)}.`;
-export const introEndsText = (name, days, until) => `${name}'s ${introAdjective(days)} rate ends after ${shortDate(until)}; from then on it earns its standard rates.`;
+export const introEndsText = (name, days, until) => `${possessive(name)} ${introAdjective(days)} rate ends after ${shortDate(until)}; from then on it earns its standard rates.`;
 // Merchant statement credits. Always dollars, never a percentage.
 export const CREDIT_PERIODS = {
     month: 'each month',
@@ -243,6 +245,8 @@ export function creditShort(c, dollars) {
 // For the to-do list: "Use your $75 lululemon credit on Amex Platinum by Dec
 // 31, 2026: $35 left."
 export const useCreditText = (card, c, left) => `Use your ${money(c.amount)} ${c.name} credit on ${card}${c.until === null ? '' : ` by ${shortDate(c.until)}`}: ${money(left)} left.`;
-export const enrollCreditText = (card, name) => `Enroll in ${card}'s ${name} credit with the issuer, then mark it enrolled.`;
+export const enrollCreditText = (card, names) => names.length === 1
+    ? `Enroll in ${possessive(card)} ${names[0] ?? ''} credit with the issuer, then mark it enrolled.`
+    : `Enroll in ${possessive(card)} ${listed(names)} credits with the issuer, then mark them enrolled.`;
 // Simulations, the cheat sheet and welcome-offer comparisons.
 export const CREDITS_LEFT_OUT = 'Merchant statement credits (dollars back at a named store) are left out.';

package/dist/format/cards.js

@@ -1,5 +1,6 @@
+import { membershipName } from "../engine/memberships.js";
 import { foreignFeeText, money, NETWORK_NAMES } from "../engine/text.js";
-export function formatCardInfo(card) {
+export function formatCardInfo(catalog, card) {
     const fee = card.annualFee === null
         ? ''
         : card.annualFee === 0
@@ -13,7 +14,9 @@ export function formatCardInfo(card) {
             ]
             : []),
         ...(card.memberships.length > 0
-            ? [`rates that need a membership: ${card.memberships.join(', ')}`]
+            ? [
+                `rates that need a membership: ${card.memberships.map((id) => `${membershipName(catalog, id)} (membership id ${id})`).join(', ')}`,
+            ]
             : []),
         ...(card.activation.length > 0
             ? [`activate with the issuer: ${card.activation.join(', ')}`]
@@ -21,6 +24,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.credits.map((c) => `merchant credit ${c.id}: ${c.text}`),
         ...(card.onlyAt ? [`works only at ${card.onlyAt.join(', ')}`] : []),
         foreignFeeText(card.foreignTransactionFee).toLowerCase(),
     ];

package/dist/format/wallet-yaml.js

@@ -1,9 +1,18 @@
 import { Document, parse, visit } from 'yaml';
 import { walletProblems } from "../data/integrity.js";
 import { CARD_NUMBER_LABEL, CARD_NUMBER_REDEMPTION, } from "../schema/card-number.js";
-import { WALLET_VERSION, WalletSchema } from "../schema/wallet.js";
+import { WALLET_VERSION, WalletCardSchema, WalletSchema, } from "../schema/wallet.js";
 // A wallet as the YAML file the CLI reads, for moving it between the
 // website, the remote server and the command line. Node-free.
+// Every field the schema defines, in its order, so a new wallet field is
+// exported without anyone remembering to add it here.
+const CARD_FIELDS = Object.keys(WalletCardSchema.shape);
+const isEmpty = (value) => value === undefined ||
+    (Array.isArray(value)
+        ? value.length === 0
+        : typeof value === 'object' &&
+            value !== null &&
+            Object.keys(value).length === 0);
 function compact(wallet) {
     return {
         version: wallet.version ?? WALLET_VERSION,
@@ -13,20 +22,7 @@ function compact(wallet) {
         ...(wallet.memberships.length > 0
             ? { memberships: wallet.memberships }
             : {}),
-        cards: wallet.cards.map((c) => ({
-            id: c.id,
-            ...(c.checkout_label === undefined
-                ? {}
-                : { 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 }
-                : {}),
-            ...(c.chosen === undefined ? {} : { chosen: c.chosen }),
-            ...(c.activated.length > 0 ? { activated: c.activated } : {}),
-            ...(c.bonus === undefined ? {} : { bonus: c.bonus }),
-        })),
+        cards: wallet.cards.map((c) => Object.fromEntries(CARD_FIELDS.flatMap((k) => (isEmpty(c[k]) ? [] : [[k, c[k]]])))),
     };
 }
 // Dates, periods and anniversaries are quoted: YAML 1.1 parsers read a bare 2026-10-15 as a

package/dist/format/wallet.js

@@ -1,4 +1,4 @@
-import { CAP_PERIODS, introAdjective, introSince, money, NETWORK_NAMES, periodPhrase, roundCents, shortDate, } from "../engine/text.js";
+import { CAP_PERIODS, introAdjective, introSince, money, NETWORK_NAMES, periodPhrase, roundCents, shortDate, possessive, } from "../engine/text.js";
 // "To do now", above the card details; nothing when all's done.
 export function formatChecklist(items) {
     return items.length === 0
@@ -64,29 +64,33 @@ export function formatWalletSummary(summary) {
         : "Point values: earnrate's defaults.";
     return [...cards, memberships, values].join('\n');
 }
-export function formatBooking(amount, cardId, cap, bonus, milestones = [], credit = null) {
+export function formatBooking(amount, name, // the card's short name
+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.`);
+        messages.push(`Used ${money(roundCents(credit.after - credit.before))} of ${possessive(name)} ${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)} ${periodPhrase(cap.periodKind, cap.period)}, ${money(left)} left.`);
+        messages.push(`Recorded ${money(amount)} on ${name} 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);
         messages.push(left === 0
-            ? `Welcome bonus spend met on ${cardId}: ${money(bonus.after)} of ${money(bonus.spend)}.`
-            : `Welcome bonus on ${cardId}: ${money(bonus.after)} of ${money(bonus.spend)} spent, ${money(left)} to go by ${bonus.deadline ?? 'the deadline'}.`);
+            ? `Welcome bonus spend met on ${name}: ${money(bonus.after)} of ${money(bonus.spend)}.`
+            : `Welcome bonus on ${name}: ${money(bonus.after)} of ${money(bonus.spend)} spent, ${money(left)} to go by ${bonus.deadline ?? 'the deadline'}.`);
     }
     // Every milestone counts the same purchases, so one line covers them.
     const first = milestones[0];
     if (first) {
         const reached = milestones.filter((m) => m.before < m.spend && m.after >= m.spend);
         const next = milestones.find((m) => m.after < m.spend);
+        const period = first.periodKind === 'cardmember_year' ? 'cardmember year' : 'year';
         messages.push([
-            `Spend on ${cardId} this ${first.periodKind === 'cardmember_year' ? 'cardmember year' : 'year'}: ${money(first.after)}.`,
+            first.started
+                ? `Started tracking spend on ${name} this ${period} with this purchase: ${money(first.after)}. Spending on it earlier this ${period} isn't counted; give the total so far (milestoneSpent) to include it.`
+                : `Spend on ${name} this ${period}: ${money(first.after)}.`,
             ...reached.map((m) => `That reaches its ${money(m.spend)} spend bonus.`),
-            ...(next
+            ...(next && !first.started
                 ? [
                     `${money(next.spend - next.after)} to go for the ${money(next.spend)} spend bonus.`,
                 ]

package/dist/mcp/schemas.js

@@ -245,6 +245,7 @@ export const RecordResultSchema = z.object({
         spend: z.number(),
         before: z.number(),
         after: z.number(),
+        started: z.boolean(),
     })),
     credit: z
         .object({

package/dist/mcp/tools/answers.js

@@ -417,7 +417,8 @@ export function registerAnswerTools(server, deps, ctx, inputs) {
             content: [
                 {
                     type: 'text',
-                    text: header + result.cards.map(formatCardInfo).join('\n'),
+                    text: header +
+                        result.cards.map((c) => formatCardInfo(catalog, c)).join('\n'),
                 },
             ],
             structuredContent: result,

package/dist/mcp/tools/wallet.js

@@ -149,7 +149,7 @@ export function registerWalletTools(server, deps, ctx, inputs) {
                 bonus,
                 milestones,
                 credit,
-                message: `${formatBooking(amount, cardId, booking, bonus, milestones, credit)} Saved in ${ctx.walletName}.`,
+                message: `${formatBooking(amount, cardText(catalog).shortName(cardId), booking, bonus, milestones, credit)} Saved in ${ctx.walletName}.`,
             }
             : {
                 recorded: false,
@@ -157,7 +157,7 @@ export function registerWalletTools(server, deps, ctx, inputs) {
                 bonus: null,
                 milestones: [],
                 credit: null,
-                message: `Nothing to track: ${cardId} has no spending cap, open welcome bonus, spend milestone or enrolled merchant credit for this purchase, so the wallet wasn't changed.`,
+                message: `Nothing to track: ${cardText(catalog).shortName(cardId)} has no spending cap, open welcome bonus, spend milestone or enrolled merchant credit for this purchase, so the wallet wasn't changed.`,
             };
         return {
             content: [

package/dist/schema/merchant.js

@@ -34,6 +34,9 @@ export const MerchantSchema = z.strictObject({
     // Costco Travel), or a booking made through one (booking: "Hotel through
     // Amex Travel").
     kind: z.enum(['portal', 'booking']).optional(),
+    // "on Walmart+ membership" rather than "at": a membership or subscription,
+    // not a store.
+    preposition: z.literal('on').optional(),
     note: z.string().optional(),
 });
 export const MerchantsFileSchema = z.array(MerchantSchema);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "earnrate",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "description": "Which credit card earns the most at a merchant, from your cards or every card, and why",
   "keywords": [
     "credit cards",