earnrate 0.2.5 → 0.2.6

package/data/cards/usbank-cash-plus.yaml

@@ -3,8 +3,8 @@ name: U.S. Bank Cash+ Visa Signature Card
 issuer: usbank
 network: visa
 currency: cash
-last_verified: 2026-10-24
-verified_by: collin
+last_verified: 2026-11-01
+verified_by: claude
 source_urls:
   - https://www.usbank.com/credit-cards/cash-plus-visa-signature-credit-card.html
   - https://cashplus.usbank.com/cash-plus/samplemerchants
@@ -64,14 +64,16 @@ choices:
 rules:
   - id: five-percent
     match: { choice: five-percent }
+    # Ground transportation leaves out parking and tolls (also cruises and
+    # tickets bought through travel agencies); no other 5% option covers them.
+    exclude: { mccs: [7523, 4784] }
     rate: 5
     cap: five-percent-combined
   - id: two-percent
     match: { choice: two-percent }
-    # Gas and grocery exclude discount stores/supercenters and wholesale clubs.
-    # Grocery-store gas stations may still count as gas, per U.S. Bank's
-    # sample merchants (Kroger Fuel Center is listed).
-    exclude: { categories: [gas.superstore] }
+    # Fast food is its own 5% option, not part of Restaurants. Gas at grocery
+    # stores is left in until the todo below is settled.
+    exclude: { categories: [gas.superstore, dining.fast_food] }
     rate: 2
   - id: travel-center
     match: { merchants: [usbank-travel-center] }
@@ -94,9 +96,29 @@ evidence:
   - rule: five-percent
     url: https://cashplus.usbank.com/cash-plus/samplemerchants
     quote: 'This category includes only the merchants listed below'
+  - rule: five-percent
+    url: https://cashplus.usbank.com/cash-plus/samplemerchants
+    quote: 'steam ships, cruise lines, freight trains, parking meters, parking garages and toll stations'
+  - rule: five-percent
+    url: https://www.usbank.com/credit-cards/cash-plus-visa-signature-credit-card.html
+    quote: 'Purchases over $2,000 in the 5% categories will earn 1% cash back.'
+  - rule: two-percent
+    url: https://www.usbank.com/credit-cards/cash-plus-visa-signature-credit-card.html
+    quote: 'Gas station and electric vehicle charging station purchases at discount stores/supercenters, wholesale clubs and grocery stores/supermarkets'
+  - rule: two-percent
+    url: https://www.usbank.com/credit-cards/cash-plus-visa-signature-credit-card.html
+    quote: 'Excludes discount stores/supercenters and wholesale clubs'
+  - rule: two-percent
+    url: https://cashplus.usbank.com/cash-plus/samplemerchants
+    quote: "Excludes most fast food restaurants like McDonald's"
+  - rule: travel-center
+    url: https://www.usbank.com/credit-cards/cash-plus-visa-signature-credit-card.html
+    quote: 'additional 4% cash back for every $1 in eligible Net Purchases spent on prepaid air, car and hotel reservations'
   - rule: annual_fee
     url: https://www.usbank.com/credit-cards/cash-plus-visa-signature-credit-card.html
-    quote: 'ANNUAL FEE $0 Annual fee'
+    quote: '$0 Annual fee'
   - rule: welcome_offer
     url: https://www.usbank.com/credit-cards/cash-plus-visa-signature-credit-card.html
     quote: 'Earn a $200 rewards bonus after you spend $1,000 in eligible purchases within the first 90 days of account opening'
+todo:
+  - "Gas at grocery stores (Kroger, Hy-Vee, Meijer) is modeled at 2%, as U.S. Bank's sample merchants page says it may qualify, varying by location; the card page's footnote says 1%, so it may earn 1% at some stations."

package/data/cards/wells-fargo-active-cash.yaml

@@ -3,10 +3,11 @@ name: Wells Fargo Active Cash Card
 issuer: wells-fargo
 network: visa
 currency: cash
-last_verified: 2026-10-26
-verified_by: collin
+last_verified: 2026-11-01
+verified_by: claude
 source_urls:
   - https://creditcards.wellsfargo.com/active-cash-credit-card/
+  - https://www.wellsfargo.com/credit-cards/active-cash/terms/
 base_rate: 2
 annual_fee: 0
 welcome_offer:
@@ -23,6 +24,9 @@ evidence:
   - rule: base_rate
     url: https://creditcards.wellsfargo.com/active-cash-credit-card/
     quote: '2% cash rewards are earned for every $1 spent in net purchases'
+  - rule: base_rate
+    url: https://www.wellsfargo.com/credit-cards/active-cash/terms/
+    quote: 'For every $1.00 you spend with this Credit Card for net purchases, you earn two cents ($0.02) in Cash Rewards.'
   - rule: annual_fee
     url: https://creditcards.wellsfargo.com/active-cash-credit-card/
     quote: '$0 annual fee'
@@ -32,3 +36,6 @@ evidence:
   - rule: welcome_offer
     url: https://creditcards.wellsfargo.com/active-cash-credit-card/
     quote: 'To qualify for the $100 cash rewards bonus, a total of at least $500 in net purchases'
+  - rule: welcome_offer
+    url: https://www.wellsfargo.com/credit-cards/active-cash/terms/
+    quote: 'opened one within the last 48 months from the date of this application'

package/data/cards/wells-fargo-autograph.yaml

@@ -3,11 +3,12 @@ name: Wells Fargo Autograph Card
 issuer: wells-fargo
 network: visa
 currency: WFR
-last_verified: 2026-10-26
-verified_by: collin
+last_verified: 2026-11-01
+verified_by: claude
 source_urls:
   - https://creditcards.wellsfargo.com/autograph-visa-credit-card/
   - https://www.wellsfargo.com/credit-cards/autograph-visa/streaming/
+  - https://www.wellsfargo.com/credit-cards/autograph-visa/terms/
 base_rate: 1
 annual_fee: 0
 welcome_offer:
@@ -18,8 +19,9 @@ welcome_offer:
 rules:
   - id: dining
     match: { categories: [dining] }
+    exclude: { merchants: [doordash, uber-eats] }
     rate: 3
-    note: Restaurants, bars (drinking places), fast food and caterers, by Visa merchant code.
+    note: Restaurants, bars (drinking places), fast food and caterers, by Visa merchant code. Wells Fargo says bakeries, food at grocery stores and third-party delivery services may not earn 3X.
   - id: travel
     match: { categories: [travel] }
     rate: 3
@@ -31,43 +33,65 @@ rules:
     note: Passenger rail, taxis, limousines, ferries, tolls and parking. Intercity bus lines aren't on Wells Fargo's list.
   - id: gas
     match: { categories: [gas, ev_charging] }
+    exclude: { categories: [gas.superstore, gas.grocery_store] }
     rate: 3
-    note: Gas stations, automated fuel dispensers and EV charging stations, by Visa merchant code.
+    note: Gas stations, automated fuel dispensers and EV charging stations, by Visa merchant code. Fuel or charging at superstores, warehouse clubs, grocery stores, car washes and auto repair shops may not earn 3X.
   - id: streaming
     match: { categories: [streaming, tv_internet] }
     rate: 3
-    note: Cable and pay TV, digital goods (books, movies, music) and subscription services. Subscriptions bundled with another product or billed by a third party (an app store, a car) may not count. An internet-only bill may not code as pay TV.
+    note: Cable and pay TV, digital goods (books, movies, music) and subscription services. Subscriptions bundled with another product or billed by a third party (an app store, a cable, phone or internet provider, an online retailer, a car) may not count. An internet-only bill may not code as pay TV.
   - id: phone
     match: { categories: [phone] }
     rate: 3
-    note: Landline and cell phone providers.
+    note: Landline and cell phone providers. Phones, accessories, add-ons like insurance or extra data, and plans bundled or billed by a third party (an internet provider, a car) may not count.
 # Not modeled: cell phone protection.
 # Issuer text backing each rule; `yarn check-sources` checks it weekly.
 evidence:
   - rule: base_rate
     url: https://creditcards.wellsfargo.com/autograph-visa-credit-card/
     quote: '1 rewards point will be earned per $1 spent on other net purchases'
+  - rule: travel
+    url: https://www.wellsfargo.com/credit-cards/autograph-visa/terms/
+    quote: 'Airlines Hotel/motels Campgrounds Timeshares Cruise lines Travel agencies Discount travel sites Vehicle/auto rentals'
   - rule: dining
     url: https://creditcards.wellsfargo.com/autograph-visa-credit-card/
     quote: 'Dining: eating places and restaurants, drinking places, fast food restaurants'
+  - rule: dining
+    url: https://www.wellsfargo.com/credit-cards/autograph-visa/terms/
+    quote: 'Grocery stores and other miscellaneous places that serve food or operate restaurants on site Third-party delivery services'
   - rule: travel
     url: https://creditcards.wellsfargo.com/autograph-visa-credit-card/
     quote: 'Travel: airline, hotel/motel, timeshare, or vehicle/auto rental, cruise lines'
   - rule: transit
     url: https://creditcards.wellsfargo.com/autograph-visa-credit-card/
-    quote: 'Transit: passenger railway, taxis, limousines, ferries, toll bridges and highways'
+    quote: 'Transit: passenger railway, taxis, limousines, ferries, toll bridges and highways, parking lots and garages'
+  - rule: transit
+    url: https://www.wellsfargo.com/credit-cards/autograph-visa/terms/
+    quote: 'Ferries Parking lots and garages Limousines Taxis Passenger railway Toll bridges and highways'
   - rule: gas
     url: https://creditcards.wellsfargo.com/autograph-visa-credit-card/
     quote: 'Gas: gas stations, automated fuel dispensers, and electric vehicle charging stations'
+  - rule: gas
+    url: https://www.wellsfargo.com/credit-cards/autograph-visa/terms/
+    quote: 'Gas or electric vehicle charging purchases made at the following locations may not earn bonus Points'
+  - rule: gas
+    url: https://www.wellsfargo.com/credit-cards/autograph-visa/terms/
+    quote: 'Auto repair stores Superstores Car washes Warehouse/membership clubs Grocery stores'
   - rule: streaming
     url: https://creditcards.wellsfargo.com/autograph-visa-credit-card/
     quote: 'Popular streaming services: cable and other pay television, digital goods, books'
   - rule: streaming
     url: https://www.wellsfargo.com/credit-cards/autograph-visa/streaming/
     quote: 'You may earn 3X on these streaming services'
+  - rule: streaming
+    url: https://www.wellsfargo.com/credit-cards/autograph-visa/terms/
+    quote: 'Streaming services that a third party bills, such as a digital platform; a cable, telecommunications, or internet provider'
   - rule: phone
     url: https://creditcards.wellsfargo.com/autograph-visa-credit-card/
     quote: 'Phone plans: landline and cell phone providers considered telecommunication services'
+  - rule: phone
+    url: https://www.wellsfargo.com/credit-cards/autograph-visa/terms/
+    quote: 'Phone-plan services that a third party bundles or bills, such as an internet provider or in-vehicle service'
   - rule: annual_fee
     url: https://creditcards.wellsfargo.com/autograph-visa-credit-card/
     quote: '$0 Annual Fee'

package/data/issuers.yaml

@@ -0,0 +1,32 @@
+# The banks behind the cards: the name shown for each, and other words people
+# search with ("bofa", "amex"). Every card's `issuer` must be one of these.
+
+- id: amex
+  name: American Express
+  search: [amex, american express]
+- id: bank-of-america
+  name: Bank of America
+  search: [bofa, boa, bankofamerica]
+- id: capital-one
+  name: Capital One
+  search: [capitalone]
+- id: chase
+  name: Chase
+- id: citi
+  name: Citi
+  search: [citibank]
+- id: column
+  # Column N.A. issues the Bilt card; people know it as Bilt.
+  name: Bilt
+  search: [bilt]
+- id: sofi
+  name: SoFi
+- id: td-bank
+  name: TD Bank
+  search: [td]
+- id: usbank
+  name: U.S. Bank
+  search: [us bank]
+- id: wells-fargo
+  name: Wells Fargo
+  search: [wf, wellsfargo]

package/data/merchants/seed.yaml

@@ -104,6 +104,13 @@
     category: streaming,
   }
 - { id: max, name: Max, aliases: [hbo max], category: streaming }
+- { id: peacock, name: Peacock, aliases: [peacock tv], category: streaming }
+- {
+    id: showtime,
+    name: Showtime,
+    aliases: [paramount plus with showtime],
+    category: streaming,
+  }
 - { id: spotify, name: Spotify, category: streaming }
 - {
     id: apple-tv,

package/dist/cli/bin.js

@@ -1,8 +1,17 @@
 #!/usr/bin/env node
 import { styleText } from 'node:util';
+import { CLI_NAME, WALLET_ENV_VAR } from "../brand.js";
 import { localToday } from "../engine/periods.js";
 import { run } from "./run.js";
-if (process.argv[2] === 'mcp') {
+if (process.argv[2] === 'mcp' && /^(-h|--help)$/.test(process.argv[3] ?? '')) {
+    process.stdout.write(`Usage: ${CLI_NAME} mcp
+
+Runs earnrate as an MCP server over stdio, for an AI assistant to start. It
+uses the same wallet file as the command line (${WALLET_ENV_VAR}, or
+~/.earnrate/wallet.yaml).
+`);
+}
+else if (process.argv[2] === 'mcp') {
     const { serveMcp } = await import("../mcp/serve.js");
     await serveMcp(process.env);
 }

package/dist/cli/cheatsheet.js

@@ -15,6 +15,7 @@ name with --cards, or else from every card earnrate knows.
 
 Options:
   --cards <ids>          Use these cards instead of your wallet, comma separated.
+  --every-card           Pick from every card earnrate knows, even with a wallet.
   --member <name>        A membership you have, like amazon-prime or costco. Repeatable.
   --valuation <profile>  flat or points-heavy, instead of your wallet's values.
   --date <YYYY-MM-DD>    The day to check. Default: today.
@@ -30,6 +31,7 @@ export async function runCheatSheet(argv, io) {
                 valuation: { type: 'string' },
                 date: { type: 'string' },
                 cards: { type: 'string' },
+                'every-card': { type: 'boolean' },
                 member: { type: 'string', multiple: true },
                 json: { type: 'boolean' },
                 help: { type: 'boolean', short: 'h' },
@@ -45,7 +47,9 @@ export async function runCheatSheet(argv, io) {
         io.stdout(CHEATSHEET_HELP);
         return 0;
     }
-    const problem = valuationProblem(values.valuation) ?? dateProblem(values.date);
+    const problem = values['every-card'] && values.cards !== undefined
+        ? 'Pick --cards or --every-card, not both.'
+        : (valuationProblem(values.valuation) ?? dateProblem(values.date));
     if (problem !== null) {
         io.stderr(`${problem}\n`);
         return USAGE_ERROR;
@@ -58,17 +62,18 @@ export async function runCheatSheet(argv, io) {
     if (loaded === null)
         return RUNTIME_ERROR;
     const date = values.date ?? io.today;
-    if (loaded === 'none') {
+    if (loaded === 'none' || values['every-card']) {
+        const saved = await savedSettings(io);
         const sheet = catalogCheatSheet(catalog, date, {
             filters: ALL_PERSONAL_CARDS,
-            memberships: values.member ?? [],
+            memberships: values.member ?? saved.memberships,
             valuations: values.valuation !== undefined && isValuationProfile(values.valuation)
                 ? VALUATION_PROFILES[values.valuation]
-                : (await savedSettings(io)).valuations,
+                : saved.valuations,
         });
         io.stdout(values.json
             ? `${JSON.stringify(sheet, null, 2)}\n`
-            : `${formatCheatSheet(sheet)}\n${NO_WALLET_HINT}\n`);
+            : `${formatCheatSheet(sheet)}${loaded === 'none' ? `\n${NO_WALLET_HINT}\n` : ''}`);
         return 0;
     }
     const wallet = values.valuation !== undefined && isValuationProfile(values.valuation)

package/dist/cli/explore.js

@@ -1,9 +1,9 @@
 import { parseArgs } from 'node:util';
 import { CLI_NAME } from "../brand.js";
 import { loadCatalog, walletPath } from "../data/load.js";
-import { ALL_PERSONAL_CARDS, exploreCards, findCategory, } from "../engine/explore.js";
+import { ALL_PERSONAL_CARDS, exploreCards, } from "../engine/explore.js";
 import { isValuationProfile, profileText, VALUATION_PROFILES, withValuationProfile, } from "../engine/profiles.js";
-import { resolveSpendLines, simulateAdditions, simulateCatalog, spendLineFor, TYPICAL_MONTHLY_SPEND, TYPICAL_SPEND_NOTE, } from "../engine/simulate.js";
+import { resolveSpendLines, simulateAdditions, simulateCatalog, spendLineFor, typicalSpend, TYPICAL_SPEND_NOTE, } from "../engine/simulate.js";
 import { formatAdditions, formatCatalogSimulation, formatExploration, } from "../format/explore.js";
 import { BOTH_CHANNELS, cardList, channelOf, dateProblem, membershipProblem, splitAmount, valuationProblem, } from "./args.js";
 import { cardsToUse, RUNTIME_ERROR, savedSettings, USAGE_ERROR, } from "./run.js";
@@ -141,10 +141,9 @@ export async function runBest(argv, io) {
         io.stderr(`${settings}\n`);
         return USAGE_ERROR;
     }
-    const category = findCategory(catalog, text);
     const result = exploreCards(catalog, {
-        merchant: category === null ? text : null,
-        category,
+        merchant: text,
+        category: null,
         amount,
         channel: channelOf(values),
         date: values.date ?? io.today,
@@ -160,13 +159,7 @@ function parseSpend(catalog, args) {
         const match = /^(.+)=\$?(\d+(?:\.\d+)?)$/.exec(arg);
         if (!match?.[1] || match[2] === undefined)
             return `"${arg}" isn't <what>=<dollars a month>, e.g. groceries=600.`;
-        const what = match[1].replace(/[-_]/g, ' ');
-        const category = findCategory(catalog, what);
-        lines.push({
-            merchant: category === null ? what : null,
-            category,
-            monthly: Number(match[2]),
-        });
+        lines.push(spendLineFor(catalog, match[1].replace(/[-_]/g, ' '), Number(match[2])));
     }
     if (lines.length === 0)
         return `Give your monthly spending, e.g. ${CLI_NAME} simulate groceries=600 dining=300 other=1000.`;
@@ -203,7 +196,7 @@ export async function runSimulate(argv, io) {
     }
     const typical = positionals.length === 0;
     const spend = typical
-        ? TYPICAL_MONTHLY_SPEND.map((t) => spendLineFor(catalog, t.what, t.monthly))
+        ? typicalSpend(catalog)
         : parseSpend(catalog, positionals);
     if (typeof spend === 'string') {
         io.stderr(`${spend}\n`);

package/dist/cli/import.js

@@ -12,7 +12,7 @@ import { cardValuation } from "../engine/valuation.js";
 import { analyzeStatement, } from "../import/analyze.js";
 import { parseStatement } from "../import/statement.js";
 import { displayPath, readWallet, RUNTIME_ERROR, USAGE_ERROR, } from "./run.js";
-import { dollarsAndCents } from "../engine/text.js";
+import { currencyName, dollarsAndCents } from "../engine/text.js";
 const IMPORT_HELP = `Usage: ${CLI_NAME} import <statement.csv> --card <card-id> [--apply]
        ${CLI_NAME} import <statement.csv>:<card-id> [<statement.csv>:<card-id> ...]
 
@@ -64,7 +64,7 @@ function valuationNote(catalog, wallet, cardIds, profile) {
     }
     if (values.size === 0)
         return 'Cash back counted as cash.';
-    const parts = [...values].map(([id, cents]) => `${String(cents)}¢ for ${catalog.currencies.find((c) => c.id === id)?.name ?? id}`);
+    const parts = [...values].map(([id, cents]) => `${String(cents)}¢ for ${currencyName(catalog, id)}`);
     const list = parts.length > 1
         ? `${parts.slice(0, -1).join(', ')} and ${parts.at(-1) ?? ''}`
         : (parts[0] ?? '');

package/dist/cli/offers.js

@@ -3,9 +3,10 @@ import { CLI_NAME } from "../brand.js";
 import { loadCatalog, walletPath } from "../data/load.js";
 import { compareOffers } from "../engine/offers.js";
 import { isValuationProfile, withValuationProfile } from "../engine/profiles.js";
+import { currencyName } from "../engine/text.js";
 import { formatOffers } from "../format/offers.js";
-import { valuationProblem } from "./args.js";
-import { cardsToUse, RUNTIME_ERROR, USAGE_ERROR } from "./run.js";
+import { cardList, valuationProblem } from "./args.js";
+import { cardsToUse, RUNTIME_ERROR, savedSettings, USAGE_ERROR, } from "./run.js";
 const OFFERS_HELP = `Usage: ${CLI_NAME} offers [--cash | --points] [--no-fee] [--business] [options]
 
 Ranks the welcome offers on cards you don't have by first-year value: the
@@ -18,6 +19,8 @@ Options:
   --no-fee               Cards with no annual fee.
   --business             Business cards instead of personal ones.
   --held                 Include cards already in your wallet.
+  --cards <ids>          Cards you have, instead of your wallet, comma separated.
+  --member <name>        A membership you have, in place of the saved ones.
   --valuation <profile>  flat or points-heavy, instead of your wallet's values.
   --all                  List every offer, not just the top 10.
   --json                 Print the full comparison as JSON.
@@ -34,6 +37,8 @@ export async function runOffers(argv, io) {
                 'no-fee': { type: 'boolean' },
                 business: { type: 'boolean' },
                 held: { type: 'boolean' },
+                cards: { type: 'string' },
+                member: { type: 'string', multiple: true },
                 valuation: { type: 'string' },
                 all: { type: 'boolean' },
                 json: { type: 'boolean' },
@@ -61,12 +66,18 @@ export async function runOffers(argv, io) {
     }
     const catalog = await loadCatalog();
     const found = await cardsToUse(catalog, walletPath(io.env), io, {
-        cards: null,
-        members: [],
+        cards: cardList(values.cards),
+        members: values.member ?? [],
     });
     if (found === null)
         return RUNTIME_ERROR;
-    const loaded = found === 'none' ? { valuations: {}, memberships: [], cards: [] } : found;
+    const loaded = found === 'none'
+        ? await savedSettings(io).then((saved) => ({
+            valuations: saved.valuations,
+            memberships: values.member ?? saved.memberships,
+            cards: [],
+        }))
+        : found;
     const wallet = values.valuation && isValuationProfile(values.valuation)
         ? withValuationProfile(loaded, values.valuation)
         : loaded;
@@ -80,7 +91,6 @@ export async function runOffers(argv, io) {
         io.stdout(`${JSON.stringify(comparison, null, 2)}\n`);
         return 0;
     }
-    const currencyName = (id) => catalog.currencies.find((c) => c.id === id)?.name ?? id;
-    io.stdout(formatOffers(comparison, currencyName, values.all ?? false));
+    io.stdout(formatOffers(comparison, (id) => currencyName(catalog, id), values.all ?? false));
     return 0;
 }

package/dist/cli/run.js

@@ -5,7 +5,7 @@ import { fileURLToPath } from 'node:url';
 import { CLI_NAME, CONFIG_DIR, LLM_ENV_VAR, LLM_MAX_CALLS_ENV_VAR, LLM_MODEL_ENV_VAR, MERCHANT_CACHE_ENV_VAR, WALLET_ENV_VAR, } from "../brand.js";
 import { walletProblems } from "../data/integrity.js";
 import { loadCatalog, loadWallet, walletPath } from "../data/load.js";
-import { ALL_PERSONAL_CARDS, categoryResolution, exploreCards, findCategory, } from "../engine/explore.js";
+import { ALL_PERSONAL_CARDS, exploreCards } from "../engine/explore.js";
 import { profileText, VALUATION_PROFILES, withValuationProfile, } from "../engine/profiles.js";
 import { recommend } from "../engine/recommend.js";
 import { walletFromCards } from "../engine/transient.js";
@@ -14,7 +14,7 @@ import { formatRecommendation, plain, } from "../format/recommendation.js";
 import { DEFAULT_LLM_MODEL } from "../merchants/anthropic.js";
 import { DEFAULT_MAX_CALLS } from "../merchants/fallback.js";
 import { llmEnabled, openLlmSession } from "../merchants/from-env.js";
-import { resolveMerchant, withCallerCategory } from "../merchants/resolve.js";
+import { resolvePlace, withCallerCategory } from "../merchants/resolve.js";
 import { packageVersion } from "../version.js";
 import { membershipProblem, parseCliArgs } from "./args.js";
 import { runCheatSheet } from "./cheatsheet.js";
@@ -63,7 +63,7 @@ Options:
   --country <code>       Where you're paying. Default: US.
   --cards <ids>          Answer for these cards instead of your wallet, comma
                          separated: --cards amex-gold,chase-prime-visa.
-  --member <name>        A membership you have, with --cards or no wallet.
+  --member <name>        A membership you have, in place of the saved ones.
   --category <id>        For a merchant earnrate doesn't know: its category,
                          e.g. grocery.supermarket. Ignored for known merchants.
   --llm, --no-llm        Ask Claude to classify merchants earnrate doesn't know.
@@ -87,7 +87,9 @@ export function displayPath(file) {
     return file.startsWith(`${home}/`) ? `~${file.slice(home.length)}` : file;
 }
 // The cards to answer for: those named with --cards, else the wallet file.
-// 'none' means no wallet and no --cards, which answers from every card.
+// 'none' means no cards saved or named, which answers from every card.
+// Named cards use the saved memberships (unless --member names some) and the
+// saved point values, as the MCP tools do.
 export async function cardsToUse(catalog, file, io, named) {
     const problem = membershipProblem(catalog, named.members);
     if (problem !== null) {
@@ -95,15 +97,16 @@ export async function cardsToUse(catalog, file, io, named) {
         return null;
     }
     if (named.cards !== null) {
+        const saved = await savedSettings(io);
         const wallet = walletFromCards(catalog, {
             cards: named.cards.map((id) => ({ id })),
-            memberships: named.members,
+            memberships: named.members.length > 0 ? named.members : saved.memberships,
         }, io.today);
         if (typeof wallet === 'string') {
             io.stderr(`${wallet}\n`);
             return null;
         }
-        return wallet;
+        return { ...wallet, valuations: saved.valuations };
     }
     try {
         await access(file);
@@ -119,7 +122,7 @@ export async function cardsToUse(catalog, file, io, named) {
         io.stderr(`Your wallet at ${displayPath(file)} has problems:\n${problems.map((p) => `  - ${p}\n`).join('')}`);
         return null;
     }
-    return loaded;
+    return loaded.cards.length === 0 ? 'none' : loaded;
 }
 export const NO_WALLET_HINT = `These are every card earnrate knows. For the best of your own cards, name them with --cards amex-gold,chase-prime-visa, or save them: ${CLI_NAME} add <card-id> (${CLI_NAME} cards finds ids).`;
 // The point values and memberships saved in the wallet, which every answer
@@ -194,14 +197,7 @@ export async function run(argv, io) {
         io.stderr(`Unknown category "${options.category}". Use one of: ${catalog.categories.map((c) => c.id).join(', ')}.\n`);
         return USAGE_ERROR;
     }
-    // Plain category words ("restaurants", "groceries") work like stores.
-    const resolvedName = resolveMerchant(catalog, purchase.merchant, purchase.channel);
-    const named = resolvedName.source === 'none' && options.category === null
-        ? findCategory(catalog, purchase.merchant)
-        : null;
-    let merchant = named === null
-        ? withCallerCategory(resolvedName, options.category)
-        : categoryResolution(catalog, named, purchase.channel);
+    let merchant = withCallerCategory(resolvePlace(catalog, purchase.merchant, purchase.channel), options.category);
     const notices = [];
     if (llmOn && merchant.source === 'none') {
         const opened = await openLlmSession({
@@ -219,6 +215,7 @@ export async function run(argv, io) {
         notices.push(...resolved.notices);
     }
     if (loaded === 'none') {
+        const saved = await savedSettings(io);
         const explored = exploreCards(catalog, {
             merchant: purchase.merchant,
             category: null,
@@ -227,10 +224,10 @@ export async function run(argv, io) {
             date: purchase.date,
         }, {
             filters: ALL_PERSONAL_CARDS,
-            memberships: options.members,
+            memberships: options.members.length > 0 ? options.members : saved.memberships,
             valuations: options.valuation
                 ? VALUATION_PROFILES[options.valuation]
-                : {},
+                : saved.valuations,
         }, merchant);
         if (options.json) {
             io.stdout(`${JSON.stringify(explored, null, 2)}\n`);

package/dist/cli/wallet.js

@@ -3,6 +3,7 @@ import { CLI_NAME } from "../brand.js";
 import { FileWalletStore } from "../data/file-store.js";
 import { loadCatalog, loadWallet, walletPath } from "../data/load.js";
 import { isValuationProfile, profileText, VALUATION_PROFILES, } from "../engine/profiles.js";
+import { membershipName } from "../engine/memberships.js";
 import { knownMemberships, searchCards } from "../engine/setup.js";
 import { formatCardInfo, formatNotes } from "../format/cards.js";
 import { displayPath, RUNTIME_ERROR, USAGE_ERROR } from "./run.js";
@@ -41,19 +42,21 @@ ${CARD_OPTIONS}
 `,
     update: `Usage: ${CLI_NAME} update <card-id> [options]
 
-Changes a card in your wallet: picks for this period, label, anniversary or
-activations. Picks for the current period are merged with ones already set.
+Changes a card in your wallet: picks for this period, label, anniversary,
+activations or welcome bonus. Picks for the current period are merged with
+ones already set.
 
 ${CARD_OPTIONS}
 `,
     remove: `Usage: ${CLI_NAME} remove <card-id>
 
-Removes a card from your wallet, with its tracked cap usage.
+Removes a card from your wallet, with its tracked cap usage and bonus
+progress. Your memberships and point values stay.
 `,
     memberships: `Usage: ${CLI_NAME} memberships [<membership>...] [--none]
 
 With no arguments, shows your memberships and the ones earnrate knows. With
-names, replaces the list. --none clears it.
+names, replaces the list. --none clears it. No cards need to be saved first.
 `,
     values: `Usage: ${CLI_NAME} values [<currency>=<cents>...] [--profile <name>]
 
@@ -213,7 +216,7 @@ export async function runWalletCommand(command, argv, io) {
         }
         const list = values.none ? [] : positionals;
         return report(await store.setMemberships(list), list.length > 0
-            ? `Memberships set to ${list.join(', ')} in ${where}.`
+            ? `Memberships set to ${list.map((m) => `${membershipName(catalog, m)} (${m})`).join(', ')} in ${where}.`
             : `Memberships cleared in ${where}.`, null, io);
     }
     if (positionals.length !== 1) {

package/dist/data/file-store.js

@@ -1,7 +1,8 @@
 import { bookPurchase } from "../engine/record.js";
 import { addToWallet, removeFromWallet, updateInWallet, withMemberships, withValuations, } from "../engine/wallet-change.js";
 import { loadWallet } from "./load.js";
-import { addCardText, commitWalletText, readWalletText, removeCardText, setMembershipsText, setValuationsText, updateCardText, writeProgress, } from "./wallet-edit.js";
+import { emptyWallet, } from "./store.js";
+import { addCardText, commitWalletText, EMPTY_WALLET_TEXT, readWalletText, removeCardText, setMembershipsText, setValuationsText, updateCardText, writeProgress, } from "./wallet-edit.js";
 const failed = (error) => ({ ok: false, error });
 const errorText = (e) => (e instanceof Error ? e.message : String(e));
 const queues = new Map();
@@ -56,7 +57,7 @@ export class FileWalletStore {
             }
         });
     }
-    // Changes other than adding a card need a wallet file to change.
+    // Changing or removing a card needs a wallet file to change.
     existing(apply) {
         return (wallet) => wallet === null
             ? `No wallet at ${this.where} yet. Add a card first to create it.`
@@ -69,15 +70,13 @@ export class FileWalletStore {
         return this.change(this.existing((w) => updateInWallet(this.catalog, w, input, today)), (text, change) => updateCardText(text ?? '', input.id, change.fields));
     }
     removeCard(cardId) {
-        return this.change(this.existing((w) => w.cards.length === 1 && w.cards[0]?.id === cardId
-            ? failed(`${cardId} is the last card in ${this.where}. To start over, delete that file; to swap cards, add the new one first.`)
-            : removeFromWallet(w, cardId)), (text) => removeCardText(text ?? '', cardId));
+        return this.change(this.existing((w) => removeFromWallet(w, cardId)), (text) => removeCardText(text ?? '', cardId));
     }
     setMemberships(memberships) {
-        return this.change(this.existing((w) => withMemberships(this.catalog, w, memberships)), (text, change) => setMembershipsText(text ?? '', change.wallet.memberships));
+        return this.change((w) => withMemberships(this.catalog, w ?? emptyWallet(), memberships), (text, change) => setMembershipsText(text ?? EMPTY_WALLET_TEXT, change.wallet.memberships));
     }
     setValuations(changes) {
-        return this.change(this.existing((w) => withValuations(this.catalog, w, changes)), (text) => setValuationsText(text ?? '', changes));
+        return this.change((w) => withValuations(this.catalog, w ?? emptyWallet(), changes), (text) => setValuationsText(text ?? EMPTY_WALLET_TEXT, changes));
     }
     record(purchase, merchant) {
         return withWalletLock(this.where, async () => {

package/dist/data/integrity.js

@@ -179,6 +179,7 @@ export function catalogProblems(catalog) {
         ['currency', catalog.currencies.map((c) => c.id)],
         ['card', catalog.cards.map((c) => c.id)],
         ['membership', catalog.memberships.map((m) => m.id)],
+        ['issuer', catalog.issuers.map((i) => i.id)],
     ]) {
         for (const id of duplicates(ids))
             problems.push(`duplicate ${kind} id '${id}'`);
@@ -203,8 +204,11 @@ export function catalogProblems(catalog) {
         for (const id of m.members_shop_at)
             if (!merchantIds.has(id))
                 problems.push(`membership ${m.id}: members_shop_at '${id}' is not a merchant`);
+    const issuers = new Set(catalog.issuers.map((i) => i.id));
     for (const card of catalog.cards) {
         problems.push(...cardProblems(card, catalog, merchantIds));
+        if (!issuers.has(card.issuer))
+            problems.push(`${card.id}: unknown issuer '${card.issuer}' (data/issuers.yaml)`);
     }
     return problems;
 }