earnrate 0.2.4 → 0.2.6

package/data/merchants/overrides.yaml

@@ -2,15 +2,18 @@
 
 # Issuer travel portals. Each issuer's own bonuses match them by id.
 - id: chase-travel
+  kind: portal
   name: Chase Travel
   domains: [travelsecure.chase.com]
   category: travel
 - id: renowned-hotels-chase-travel
+  kind: booking
   name: Renowned Hotels and Resorts (Chase Travel)
   aliases: [renowned hotels, renowned hotels and resorts]
   category: travel
   note: Prepaid stays in the Renowned Hotels and Resorts collection for United cardmembers on Chase Travel.
 - id: costco-travel
+  kind: portal
   name: Costco Travel
   domains: [costcotravel.com]
   category: travel
@@ -25,6 +28,7 @@
   domains: [aadvantagecars.com]
   category: travel
 - id: amex-travel
+  kind: portal
   name: American Express Travel
   aliases: [amex travel]
   domains: [amextravel.com]
@@ -42,15 +46,18 @@
 # bank's own bonuses match these merchants by id. Bonuses that depend on what's
 # booked get one merchant per booking type.
 - id: amex-travel-hotels
+  kind: booking
   name: Hotel through Amex Travel
   aliases: [amex travel hotel, amex travel hotels, hotel amex travel]
   category: travel
   note: Prepaid hotels only for the Amex bonuses.
 - id: amex-travel-flights
+  kind: booking
   name: Flight through Amex Travel
   aliases: [amex travel flight, amex travel flights, flight amex travel]
   category: travel
 - id: airbnb-amex-travel
+  kind: booking
   name: Airbnb through Amex Travel
   aliases:
     [
@@ -62,18 +69,22 @@
   category: travel
   note: Prepaid Airbnb stays booked in AmexTravel.com or the Amex Travel app, with your Airbnb account linked to Amex.
 - id: amex-travel-car-rentals
+  kind: booking
   name: Car rental through Amex Travel
   aliases: [amex travel car rental, amex travel car]
   category: travel
 - id: amex-travel-cruises
+  kind: booking
   name: Cruise through Amex Travel
   aliases: [amex travel cruise]
   category: travel
 - id: usbank-travel-center
+  kind: portal
   name: U.S. Bank Travel Center
   aliases: [us bank travel center]
   category: travel
 - id: sofi-travel
+  kind: portal
   name: SoFi Travel
   category: travel
 
@@ -177,38 +188,45 @@
 # Card issuers' travel and ticketing sites (see the Amex Travel note above).
 - {
     id: capital-one-travel,
+    kind: portal,
     name: Capital One Travel,
     aliases: [capital one travel],
     category: travel,
   }
 - {
     id: capital-one-travel-hotels,
+    kind: booking,
     name: Hotel through Capital One Travel,
     aliases: [capital one travel hotel],
     category: travel,
   }
 - id: capital-one-travel-vacation-rentals
+  kind: booking
   name: Vacation rental through Capital One Travel
   aliases: [capital one travel vacation rental]
   category: travel
 - {
     id: capital-one-travel-car-rentals,
+    kind: booking,
     name: Car rental through Capital One Travel,
     aliases: [capital one travel car rental],
     category: travel,
   }
 - {
     id: capital-one-travel-flights,
+    kind: booking,
     name: Flight through Capital One Travel,
     aliases: [capital one travel flight],
     category: travel,
   }
 - id: capital-one-entertainment
+  kind: portal
   name: Capital One Entertainment
   aliases: [capital one entertainment tickets]
   category: entertainment
 - {
     id: citi-travel,
+    kind: portal,
     name: Citi Travel,
     aliases: [citi travel],
     domains: [cititravel.com],
@@ -216,42 +234,49 @@
   }
 - {
     id: citi-travel-hotels,
+    kind: booking,
     name: Hotel through Citi Travel,
     aliases: [citi travel hotel],
     category: travel,
   }
 - {
     id: citi-travel-car-rentals,
+    kind: booking,
     name: Car rental through Citi Travel,
     aliases: [citi travel car rental],
     category: travel,
   }
 - {
     id: citi-travel-attractions,
+    kind: booking,
     name: Attraction through Citi Travel,
     aliases: [citi travel attraction],
     category: travel,
   }
 - {
     id: citi-travel-flights,
+    kind: booking,
     name: Flight through Citi Travel,
     aliases: [citi travel flight],
     category: travel,
   }
 - {
     id: bilt-travel,
+    kind: portal,
     name: Bilt Travel,
     aliases: [bilt travel],
     category: travel,
   }
 - {
     id: bilt-travel-hotels,
+    kind: booking,
     name: Hotel through Bilt Travel,
     aliases: [bilt travel hotel],
     category: travel,
   }
 - {
     id: bilt-travel-flights,
+    kind: booking,
     name: Flight through Bilt Travel,
     aliases: [bilt travel flight],
     category: travel,

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

@@ -6,7 +6,7 @@ import { ALL_PERSONAL_CARDS } from "../engine/explore.js";
 import { isValuationProfile, VALUATION_PROFILES, withValuationProfile, } from "../engine/profiles.js";
 import { formatCheatSheet } from "../format/cheat-sheet.js";
 import { cardList, dateProblem, valuationProblem } from "./args.js";
-import { cardsToUse, NO_WALLET_HINT, RUNTIME_ERROR, USAGE_ERROR, } from "./run.js";
+import { cardsToUse, NO_WALLET_HINT, RUNTIME_ERROR, savedSettings, USAGE_ERROR, } from "./run.js";
 const CHEATSHEET_HELP = `Usage: ${CLI_NAME} cheatsheet [options]
 
 The card to use for each everyday kind of purchase this quarter: from your
@@ -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]
-                : {},
+                : 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,20 +1,21 @@
 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 { isValuationProfile, VALUATION_PROFILES, withValuationProfile, } from "../engine/profiles.js";
-import { resolveSpendLines, simulateAdditions, simulateCatalog, spendLineFor, TYPICAL_MONTHLY_SPEND, TYPICAL_SPEND_NOTE, } from "../engine/simulate.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, 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, USAGE_ERROR } from "./run.js";
+import { cardsToUse, RUNTIME_ERROR, savedSettings, USAGE_ERROR, } from "./run.js";
 const FILTER_OPTIONS = `  --cash, --points        Cash back cards only, or points and miles cards only.
   --no-fee                Cards with no annual fee.
   --issuer <id>           One issuer's cards, e.g. chase or amex.
   --business              Business cards instead of personal ones.
   --closed                Include cards the issuer no longer takes applications for.
   --member <name>         A membership you have, e.g. amazon-prime or costco. Repeatable.
-  --valuation <profile>   flat (points at 1¢, the default) or points-heavy
-                          (MR and UR at 1.7¢).`;
+  --valuation <profile>   flat (${profileText('flat')}) or points-heavy
+                          (${profileText('points-heavy')}), instead of your
+                          saved point values.`;
 const BEST_HELP = `Usage: ${CLI_NAME} best <merchant or category> [amount] [options]
 
 Ranks every card in earnrate's catalog for one purchase, not just yours. Each
@@ -67,7 +68,7 @@ const FILTER_FLAGS = {
     json: { type: 'boolean' },
     help: { type: 'boolean', short: 'h' },
 };
-function settingsFrom(values, catalog) {
+function settingsFrom(values, catalog, saved) {
     if (values.cash && values.points)
         return 'Pick --cash or --points, not both.';
     const problem = valuationProblem(values.valuation) ??
@@ -86,10 +87,10 @@ function settingsFrom(values, catalog) {
             issuer: values.issuer ?? null,
             includeClosed: values.closed ?? false,
         },
-        memberships: values.member ?? [],
+        memberships: values.member ?? saved.memberships,
         valuations: values.valuation !== undefined && isValuationProfile(values.valuation)
             ? VALUATION_PROFILES[values.valuation]
-            : {},
+            : saved.valuations,
     };
 }
 export async function runBest(argv, io) {
@@ -135,22 +136,21 @@ export async function runBest(argv, io) {
         return USAGE_ERROR;
     }
     const catalog = await loadCatalog();
-    const settings = settingsFrom(values, catalog);
+    const settings = settingsFrom(values, catalog, await savedSettings(io));
     if (typeof settings === 'string') {
         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,
     }, settings);
     io.stdout(values.json
         ? `${JSON.stringify(result, null, 2)}\n`
-        : formatExploration(result, values.all ?? false));
+        : formatExploration(result, catalog, values.all ?? false));
     return 0;
 }
 function parseSpend(catalog, args) {
@@ -159,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.`;
@@ -195,14 +189,14 @@ export async function runSimulate(argv, io) {
         return 0;
     }
     const catalog = await loadCatalog();
-    const settings = settingsFrom(values, catalog);
+    const settings = settingsFrom(values, catalog, await savedSettings(io));
     if (typeof settings === 'string') {
         io.stderr(`${settings}\n`);
         return USAGE_ERROR;
     }
     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,6 +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 { 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> ...]
 
@@ -44,7 +45,6 @@ const LedgerSchema = z.strictObject({
 const fingerprint = ({ cardId, line }, kind = 'cap') => createHash('sha256')
     .update(`${kind === 'bonus' ? 'bonus|' : ''}${cardId}|${line.date}|${String(line.amount)}|${line.description}`)
     .digest('hex');
-const usd = (n) => `$${n.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`;
 // "statement.csv:chase-sapphire-preferred" names the card inline.
 function splitTarget(arg) {
     const m = /^(.+):([a-z0-9]+(?:-[a-z0-9]+)*)$/.exec(arg);
@@ -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] ?? '');
@@ -77,20 +77,20 @@ function formatAnalysis(a, labelOf, valuation, categoryName) {
         several
             ? `${String(a.byCard.length)} statements (${names.join(', ')}) · ${a.from} to ${a.to}`
             : `${names[0] ?? ''} statement · ${a.from} to ${a.to}`,
-        `${String(a.purchases)} purchases, ${usd(a.spend)}${a.refunds > 0 ? ` (refunds and credits: ${usd(a.refunds)})` : ''}`,
+        `${String(a.purchases)} purchases, ${dollarsAndCents(a.spend)}${a.refunds > 0 ? ` (refunds and credits: ${dollarsAndCents(a.refunds)})` : ''}`,
         '',
     ];
     if (several) {
-        out.push(`Earned on the cards you used: about ${usd(a.earned)}`);
+        out.push(`Earned on the cards you used: about ${dollarsAndCents(a.earned)}`);
         const width = Math.max(...names.map((n) => n.length));
         for (const t of a.byCard) {
-            out.push(`  ${labelOf(t.cardId).padEnd(width)}  ${String(t.purchases).padStart(4)} × ${usd(t.spend).padStart(11)}  ${usd(t.earned)}`);
+            out.push(`  ${labelOf(t.cardId).padEnd(width)}  ${String(t.purchases).padStart(4)} × ${dollarsAndCents(t.spend).padStart(11)}  ${dollarsAndCents(t.earned)}`);
         }
     }
     else {
-        out.push(`Earned on ${names[0] ?? ''}: about ${usd(a.earned)}`);
+        out.push(`Earned on ${names[0] ?? ''}: about ${dollarsAndCents(a.earned)}`);
     }
-    out.push(`With earnrate's picks: about ${usd(a.best)} (+${usd(a.best - a.earned)})`, valuation);
+    out.push(`With earnrate's picks: about ${dollarsAndCents(a.best)} (+${dollarsAndCents(a.best - a.earned)})`, valuation);
     if (a.missed.length > 0) {
         out.push('', 'Where another card would have earned more:');
         const shown = a.missed.slice(0, 10);
@@ -99,7 +99,7 @@ function formatAnalysis(a, labelOf, valuation, categoryName) {
         const cardWidth = Math.max(...shown.map((m) => labelOf(m.usedCardId).length));
         for (const m of shown) {
             const used = several ? `${labelOf(m.usedCardId).padEnd(cardWidth)}  ` : '';
-            out.push(`  ${name(m).slice(0, width).padEnd(width)}  ${used}${String(m.count).padStart(3)} × ${usd(m.spend).padStart(10)}  ${usd(m.earned)} → ${m.bestCard} ${usd(m.best)}  (+${usd(m.best - m.earned)})`);
+            out.push(`  ${name(m).slice(0, width).padEnd(width)}  ${used}${String(m.count).padStart(3)} × ${dollarsAndCents(m.spend).padStart(10)}  ${dollarsAndCents(m.earned)} → ${m.bestCard} ${dollarsAndCents(m.best)}  (+${dollarsAndCents(m.best - m.earned)})`);
         }
         if (a.missed.length > 10)
             out.push(`  …and ${String(a.missed.length - 10)} more merchants`);
@@ -117,7 +117,7 @@ function formatAnalysis(a, labelOf, valuation, categoryName) {
         const last = new Map();
         for (const { cardId, booking } of a.bookings)
             last.set(several ? `${labelOf(cardId)} ${booking.capKey}` : booking.capKey, booking.after);
-        out.push(`Cap usage for the current period: ${[...last].map(([k, v]) => `${k} ${usd(v)}`).join(', ')}.`);
+        out.push(`Cap usage for the current period: ${[...last].map(([k, v]) => `${k} ${dollarsAndCents(v)}`).join(', ')}.`);
     }
     else if (a.alreadyImported > 0) {
         out.push(`Caps: nothing new to record. ${String(a.alreadyImported)} purchase(s) were recorded by an earlier import.`);
@@ -129,7 +129,7 @@ function formatAnalysis(a, labelOf, valuation, categoryName) {
         out.push('Caps: nothing new to record.');
     }
     for (const b of a.bonuses) {
-        out.push(`Welcome bonus on ${labelOf(b.cardId)}: ${usd(b.before)} → ${usd(b.after)} of ${usd(b.spend)}${b.deadline ? ` by ${b.deadline}` : ''}.`);
+        out.push(`Welcome bonus on ${labelOf(b.cardId)}: ${dollarsAndCents(b.before)} → ${dollarsAndCents(b.after)} of ${dollarsAndCents(b.spend)}${b.deadline ? ` by ${b.deadline}` : ''}.`);
     }
     return `${out.join('\n')}\n`;
 }

package/dist/cli/offers.js

@@ -3,13 +3,15 @@ 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
-bonus at your point values minus the first year's annual fee.
+bonus at your point values minus the first year's annual fee and any
+membership the card needs that you don't have.
 
 Options:
   --cash                 Cash back cards only.
@@ -17,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.
@@ -33,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' },
@@ -60,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;
@@ -79,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,8 +5,8 @@ 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 { VALUATION_PROFILES, withValuationProfile } from "../engine/profiles.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";
 import { formatExploration } from "../format/explore.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";
@@ -43,6 +43,7 @@ Save your cards (optional):
   ${CLI_NAME} update <card-id> [--pick ...]        Change picks, label or activations.
   ${CLI_NAME} remove <card-id>                     Remove a card.
   ${CLI_NAME} memberships [names...]               Show or set memberships (amazon-prime, costco).
+  ${CLI_NAME} values [UR=1.5 ...]                  Show or set what your points are worth.
 
 Other commands:
   ${CLI_NAME} cheatsheet                           The best card for each category this quarter.
@@ -53,7 +54,8 @@ Other commands:
 
 Options:
   --online, --in-store   How you're paying. Default: inferred from the merchant.
-  --valuation <profile>  flat (points at 1¢) or points-heavy (MR and UR at 1.7¢).
+  --valuation <profile>  flat (${profileText('flat')}) or points-heavy (${profileText('points-heavy')}),
+                         instead of your saved point values.
                          Default: the values in your wallet.
   --all                  List every card, not just the top three.
   --json                 Print the full recommendation as JSON.
@@ -61,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.
@@ -85,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) {
@@ -93,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);
@@ -117,9 +122,21 @@ 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
+// uses unless --valuation or --member says otherwise. No wallet, or one that
+// can't be read, has none.
+export async function savedSettings(io) {
+    try {
+        const { valuations, memberships } = await loadWallet(walletPath(io.env));
+        return { valuations, memberships };
+    }
+    catch {
+        return { valuations: {}, memberships: [] };
+    }
+}
 export async function readWallet(file, io) {
     try {
         return await loadWallet(file);
@@ -180,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({
@@ -205,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,
@@ -213,16 +224,16 @@ 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`);
         }
         else {
-            io.stdout(`${formatExploration(explored, options.all)}\n${NO_WALLET_HINT}\n`);
+            io.stdout(`${formatExploration(explored, catalog, options.all)}\n${NO_WALLET_HINT}\n`);
         }
         for (const n of notices)
             io.stderr(`${n}\n`);