earnrate 0.2.5 → 0.2.6

package/dist/engine/wallet-change.js

@@ -3,15 +3,15 @@ import { addMonths } from "./bonus.js";
 import { capByKey } from "./evaluate.js";
 import { choicePeriod, periodKey } from "./periods.js";
 import { knownMemberships, searchCards, setupNotes, } from "./setup.js";
+import { idList } from "./text.js";
 const failed = (error) => ({ ok: false, error });
-const list = (ids) => ids.join(', ');
 function findCatalogCard(catalog, id, today) {
     const card = catalog.cards.find((c) => c.id === id);
     if (card)
         return card;
     const near = searchCards(catalog, id, null, today).cards.map((c) => c.id);
     return near.length > 0
-        ? `No card '${id}' in earnrate. Closest: ${list(near)}.`
+        ? `No card '${id}' in earnrate. Closest: ${idList(near)}.`
         : `No card '${id}' in earnrate. Search the catalog to find its id.`;
 }
 function isAnniversary(text) {
@@ -51,7 +51,7 @@ export function cardFields(card, held, input, today) {
         for (const id of input.activated) {
             if (!needing.includes(id)) {
                 problems.push(needing.length > 0
-                    ? `'${id}' isn't a ${card.id} rule that needs activating. Those are: ${list(needing)}.`
+                    ? `'${id}' isn't a ${card.id} rule that needs activating. Those are: ${idList(needing)}.`
                     : `${card.id} has no rules that need activating.`);
             }
         }
@@ -62,14 +62,14 @@ export function cardFields(card, held, input, today) {
             const choice = card.choices.find((c) => c.id === choiceId);
             if (!choice) {
                 problems.push(card.choices.length > 0
-                    ? `${card.id} has no '${choiceId}' pick. Its picks are: ${list(card.choices.map((c) => c.id))}.`
+                    ? `${card.id} has no '${choiceId}' pick. Its picks are: ${idList(card.choices.map((c) => c.id))}.`
                     : `${card.id} has no categories to pick.`);
                 continue;
             }
             const options = Object.keys(choice.options);
             for (const p of picks) {
                 if (!options.includes(p)) {
-                    problems.push(`'${p}' isn't a ${choiceId} option for ${card.id}. Options: ${list(options)}.`);
+                    problems.push(`'${p}' isn't a ${choiceId} option for ${card.id}. Options: ${idList(options)}.`);
                 }
             }
             if (picks.length === 0 || picks.length > choice.pick) {
@@ -101,7 +101,7 @@ export function cardFields(card, held, input, today) {
                         .map((r) => r.id),
                 ];
                 problems.push(keys.length > 0
-                    ? `${card.id} has no cap '${key}'. Its caps are: ${list(keys)}.`
+                    ? `${card.id} has no cap '${key}'. Its caps are: ${idList(keys)}.`
                     : `${card.id} has no spending caps.`);
                 continue;
             }
@@ -206,7 +206,7 @@ export function updateInWallet(catalog, wallet, input, today) {
     const held = wallet.cards.find((c) => c.id === input.id);
     const card = catalog.cards.find((c) => c.id === input.id);
     if (!held || !card) {
-        return failed(`${input.id} isn't in the wallet. Cards: ${list(wallet.cards.map((c) => c.id))}.`);
+        return failed(`${input.id} isn't in the wallet. Cards: ${idList(wallet.cards.map((c) => c.id))}.`);
     }
     const fields = cardFields(card, held, input, today);
     if (typeof fields === 'string')
@@ -227,10 +227,8 @@ export function updateInWallet(catalog, wallet, input, today) {
 }
 export function removeFromWallet(wallet, id) {
     if (!wallet.cards.some((c) => c.id === id)) {
-        return failed(`${id} isn't in the wallet. Cards: ${list(wallet.cards.map((c) => c.id))}.`);
+        return failed(`${id} isn't in the wallet. Cards: ${idList(wallet.cards.map((c) => c.id))}.`);
     }
-    // Removing the last card leaves an empty wallet, which each store keeps
-    // in its own way (or refuses, for a wallet file).
     return {
         ok: true,
         wallet: { ...wallet, cards: wallet.cards.filter((c) => c.id !== id) },
@@ -242,7 +240,7 @@ export function withMemberships(catalog, wallet, memberships) {
     const known = knownMemberships(catalog);
     const unknown = memberships.filter((m) => !known.includes(m));
     if (unknown.length > 0) {
-        return failed(`No card uses ${unknown.map((m) => `'${m}'`).join(', ')}. Memberships earnrate knows: ${list(known)}.`);
+        return failed(`No card uses ${unknown.map((m) => `'${m}'`).join(', ')}. Memberships earnrate knows: ${idList(known)}.`);
     }
     return {
         ok: true,
@@ -256,7 +254,7 @@ export function withMemberships(catalog, wallet, memberships) {
 export function withValuations(catalog, wallet, changes) {
     const unknown = Object.keys(changes).filter((id) => !catalog.currencies.some((c) => c.id === id));
     if (unknown.length > 0)
-        return failed(`Unknown currency ${unknown.map((id) => `'${id}'`).join(', ')}. Currencies: ${list(catalog.currencies.map((c) => c.id))}.`);
+        return failed(`Unknown currency ${unknown.map((id) => `'${id}'`).join(', ')}. Currencies: ${idList(catalog.currencies.map((c) => c.id))}.`);
     const odd = Object.entries(changes).filter(([, cents]) => cents !== null && !(cents > 0 && cents <= MAX_CENTS));
     if (odd.length > 0)
         return failed(`A point is worth more than 0¢ and at most ${String(MAX_CENTS)}¢; check ${odd.map(([id]) => id).join(', ')}.`);

package/dist/engine/wallet-summary.js

@@ -1,17 +1,18 @@
+import { findMerchant } from "../merchants/resolve.js";
 import { bonusStatus } from "./bonus.js";
 import { activationGroup, capUsed, isActivated, pickedCategories, } from "./evaluate.js";
-import { daysBetween } from "./periods.js";
+import { membershipName } from "./memberships.js";
+import { daysBetween, inEffect, periodEnd } from "./periods.js";
 import { STALE_AFTER_DAYS } from "./recommend.js";
 import { rotationGap } from "./rotation.js";
 import { activationRules } from "./setup.js";
-import { categoryPhrase, choiceName, currencyLabel, earnText, listed, words, } from "./text.js";
+import { CAP_PERIODS, categoryPhrase, choiceName, currencyLabel, earnText, listed, shortDate, wholeDollars, words, } from "./text.js";
 import { cardValuation, currencyValuation } from "./valuation.js";
 // 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/;
 function merchantName(catalog, id) {
-    const all = [...catalog.merchants.overrides, ...catalog.merchants.seed];
-    const merchant = all.find((m) => m.id === id);
+    const merchant = findMerchant(catalog, id);
     const name = merchant?.name ?? words(id);
     return merchant?.kind === 'booking'
         ? name.replace(BOOKING, (kind) => `${kind.toLowerCase()}s`)
@@ -33,30 +34,22 @@ export function optionName(catalog, card, choiceId, option) {
 function ruleParts(catalog, rule) {
     if (rule.match.choice !== undefined)
         return [`your ${choiceName(rule.match.choice)} picks`];
+    const merchants = rule.match.merchants ?? [];
+    // A long list of one kind of store reads as "select streaming services".
+    const kinds = new Set(merchants.map((m) => findMerchant(catalog, m)?.category));
+    const [kind] = kinds;
+    const merchantParts = merchants.length > 4 && kinds.size === 1 && kind !== undefined
+        ? [`select ${categoryPhrase(catalog, kind)}`]
+        : merchants.map((m) => merchantName(catalog, m));
     const parts = [
         ...(rule.match.categories ?? []).map((c) => categoryPhrase(catalog, c)),
-        ...(rule.match.merchants ?? []).map((m) => merchantName(catalog, m)),
+        ...merchantParts,
     ];
     return parts.length > 0 ? parts : [words(rule.id)];
 }
 function ruleWhat(catalog, rule) {
     return listed(ruleParts(catalog, rule));
 }
-function periodEnd(period) {
-    const quarter = /^(\d{4})-Q([1-4])$/.exec(period);
-    if (quarter) {
-        const end = ['03-31', '06-30', '09-30', '12-31'][Number(quarter[2]) - 1];
-        return `${quarter[1] ?? ''}-${end ?? ''}`;
-    }
-    const month = /^(\d{4})-(\d{2})$/.exec(period);
-    if (month) {
-        const last = new Date(Date.UTC(Number(month[1]), Number(month[2]), 0));
-        return last.toISOString().slice(0, 10);
-    }
-    return /^\d{4}$/.test(period) ? `${period}-12-31` : null;
-}
-const applies = (rule, today) => (rule.valid_from === undefined || rule.valid_from <= today) &&
-    (rule.valid_to === undefined || rule.valid_to >= today);
 const matchKeys = (rule) => rule.match.choice !== undefined
     ? []
     : [
@@ -68,9 +61,22 @@ const matchKeys = (rule) => rule.match.choice !== undefined
 // is a lower tier that an uncapped, always-on higher rate fully covers (Prime
 // Visa's 3% without Prime, once Prime is held). Rules at the same rate share
 // a line.
+// "first $1,500 a quarter, combined": how much of a rate's spending earns it.
+function capLimit(card, shown, rule) {
+    if (rule.cap === undefined)
+        return '';
+    const cap = typeof rule.cap === 'string'
+        ? card.caps.find((c) => c.id === rule.cap)
+        : rule.cap;
+    if (!cap)
+        return '';
+    const shared = typeof rule.cap === 'string' &&
+        shown.filter((r) => r.cap === rule.cap).length > 1;
+    return `first ${wholeDollars(cap.amount)} ${CAP_PERIODS[cap.period]}${shared ? ', combined' : ''}`;
+}
 function headlineRates(catalog, wallet, card, held, currency, today) {
     const shown = card.rules
-        .filter((r) => applies(r, today) &&
+        .filter((r) => inEffect(r, today) &&
         r.rate > card.base_rate &&
         (r.requires?.membership === undefined ||
             wallet.memberships.includes(r.requires.membership)))
@@ -86,8 +92,11 @@ function headlineRates(catalog, wallet, card, held, currency, today) {
         if (keys.length > 0 && keys.every((k) => higher.includes(k)))
             continue;
         const pending = r.requires?.activation && !isActivated(card, held, r.id);
-        const head = `${earnText(catalog, r.rate, currency)} on`;
-        const key = pending ? `${head}|activate` : head;
+        const key = [
+            `${earnText(catalog, r.rate, currency)} on`,
+            capLimit(card, shown, r),
+            pending ? ', once activated' : '',
+        ].join('|');
         const whats = lines.get(key) ?? [];
         for (const part of ruleParts(catalog, r))
             if (!whats.includes(part))
@@ -95,7 +104,11 @@ function headlineRates(catalog, wallet, card, held, currency, today) {
         lines.set(key, whats);
     }
     return [
-        ...[...lines].map(([key, whats]) => `${key.replace('|activate', '')} ${listed(whats)}${key.endsWith('|activate') ? ' (once activated)' : ''}`),
+        ...[...lines].map(([key, whats]) => {
+            const [head = '', limit = '', activate = ''] = key.split('|');
+            const after = `${limit}${activate}`;
+            return `${head} ${listed(whats)}${after === '' ? '' : ` (${after.replace(/^, /, '')})`}`;
+        }),
         `${earnText(catalog, card.base_rate, currency)} on everything else`,
     ];
 }
@@ -110,9 +123,14 @@ function toActivate(catalog, card, held, today) {
             seen.add(g);
         const rules = card.rules.filter((r) => group.includes(r.id));
         const first = rules[0];
+        const deadline = first?.activate_by === undefined
+            ? ''
+            : `, activate by ${shortDate(first.activate_by)}`;
         const when = first?.valid_from !== undefined && first.valid_to !== undefined
-            ? ` (${first.valid_from} to ${first.valid_to})`
-            : '';
+            ? ` (${shortDate(first.valid_from)} to ${shortDate(first.valid_to)}${deadline})`
+            : deadline === ''
+                ? ''
+                : ` (${deadline.slice(2)})`;
         out.push(`${rules.map((r) => ruleWhat(catalog, r)).join(', ')}${when}`);
     }
     return out;
@@ -204,7 +222,16 @@ export function walletSummary(catalog, wallet, today) {
             anniversary: held.anniversary ?? null,
         });
     }
-    const pointValues = Object.keys(wallet.valuations)
+    return {
+        memberships: wallet.memberships,
+        membershipNames: wallet.memberships.map((m) => membershipName(catalog, m)),
+        pointValues: pointValues(catalog, wallet),
+        started: null,
+        cards,
+    };
+}
+function pointValues(catalog, wallet) {
+    return Object.keys(wallet.valuations)
         .filter((id) => catalog.currencies.some((c) => c.id === id))
         .map((id) => ({
         currency: id,
@@ -212,5 +239,14 @@ export function walletSummary(catalog, wallet, today) {
         centsPerUnit: currencyValuation(catalog, wallet, id).centsPerUnit,
         redemption: redemptionOf(catalog, id, wallet.valuations[id]),
     }));
-    return { memberships: wallet.memberships, pointValues, started: null, cards };
+}
+// The memberships and point values a wallet holds besides its cards, in
+// words: what replacing or deleting it would lose.
+export function savedSettingsText(catalog, wallet) {
+    return [
+        ...wallet.memberships.map((m) => membershipName(catalog, m)),
+        ...pointValues(catalog, wallet).map((v) => v.redemption === null
+            ? `${v.name} at ${String(v.centsPerUnit)}¢`
+            : `${v.name} redeemed ${v.redemption}`),
+    ];
 }

package/dist/format/card-text.js

@@ -1,24 +1,10 @@
 import { earnText } from "../engine/text.js";
 // Card names, fees and requirements as earnrate.dev and its static search
 // pages show them. Node-free: the site bundles it.
-const ISSUERS = {
-    amex: 'American Express',
-    'bank-of-america': 'Bank of America',
-    'capital-one': 'Capital One',
-    chase: 'Chase',
-    citi: 'Citi',
-    column: 'Bilt',
-    sofi: 'SoFi',
-    'td-bank': 'TD Bank',
-    usbank: 'U.S. Bank',
-    'wells-fargo': 'Wells Fargo',
-};
-export { CAP_PERIODS, PICK_PERIODS, words } from "../engine/text.js";
 import { membershipName, membershipText } from "../engine/memberships.js";
 import { CAP_PERIODS, PICK_PERIODS, wholeDollars, words, } from "../engine/text.js";
-// Whole dollars, for fees and caps.
-export const usd = wholeDollars;
-export const issuerName = (id) => ISSUERS[id] ?? id;
+// An issuer's name as people know it, from data/issuers.yaml.
+export const issuerName = (catalog, id) => catalog.issuers.find((i) => i.id === id)?.name ?? id;
 export function cardText(catalog) {
     const cards = new Map(catalog.cards.map((c) => [c.id, c]));
     function shortName(id) {
@@ -40,8 +26,8 @@ export function cardText(catalog) {
             return `No annual fee${needs}`;
         const first = card?.first_year_fee;
         if (first !== undefined && first !== fee)
-            return `${usd(fee)} a year (${first === 0 ? 'waived' : usd(first)} the first year)${needs}`;
-        return `${usd(fee)} a year${needs}`;
+            return `${wholeDollars(fee)} a year (${first === 0 ? 'waived' : wholeDollars(first)} the first year)${needs}`;
+        return `${wholeDollars(fee)} a year${needs}`;
     }
     // `until` is the last day a time-limited rate applies, already formatted.
     function requirementLines(cardId, r, until = null) {
@@ -49,13 +35,13 @@ export function cardText(catalog) {
         if (r.pick)
             lines.push(`Pick ${r.pick.options.map(words).join(' or ')} as a bonus category (${PICK_PERIODS[r.pick.period]})`);
         if (r.activation !== null)
-            lines.push(`Activate the bonus with ${issuerName(cards.get(cardId)?.issuer ?? '')} (free)`);
+            lines.push(`Activate the bonus with ${issuerName(catalog, cards.get(cardId)?.issuer ?? '')} (free)`);
         if (r.membership !== null)
             lines.push(`With ${membershipName(catalog, r.membership)}`);
         if (until !== null)
             lines.push(`This rate runs through ${until}`);
         if (r.cap)
-            lines.push(`Up to ${usd(r.cap.amount)} of spending ${CAP_PERIODS[r.cap.period]}, then ${earnText(catalog, r.cap.thenRate, r.cap.currency)}`);
+            lines.push(`Up to ${wholeDollars(r.cap.amount)} of spending ${CAP_PERIODS[r.cap.period]}, then ${earnText(catalog, r.cap.thenRate, r.cap.currency)}`);
         return lines;
     }
     const memberName = (id) => membershipName(catalog, id);
@@ -65,5 +51,6 @@ export function cardText(catalog) {
         feeLabel,
         requirementLines,
         membershipName: memberName,
+        issuerName: (id) => issuerName(catalog, id),
     };
 }

package/dist/format/explore.js

@@ -1,5 +1,5 @@
 import { membershipName, membershipNote, } from "../engine/memberships.js";
-import { choiceName, feeText, money, pct, wholeDollars, words, } from "../engine/text.js";
+import { choiceName, feeText, dollarsAndCents, pct, wholeDollars, words, } from "../engine/text.js";
 const membershipFees = (memberships) => memberships
     .map((m) => ` + ${wholeDollars(m.annualFee)} for ${m.name}`)
     .join('');
@@ -17,7 +17,7 @@ export function formatExploration(r, catalog, all) {
     const width = Math.max(...shown.map((e) => e.cardName.length));
     const lines = [`Best cards for ${title}:`, ''];
     shown.forEach((e, i) => {
-        const earned = e.earned === null ? '' : `  ${money(e.earned)}`;
+        const earned = e.earned === null ? '' : `  ${dollarsAndCents(e.earned)}`;
         lines.push(`${String(i + 1).padStart(2)}. ${e.cardName.padEnd(width)}  ${pct(e.effectiveReturnPct).padStart(5)}${earned}  ${feeText(e)}`);
         for (const c of e.conditions)
             lines.push(`    ${c}`);

package/dist/format/offers.js

@@ -1,5 +1,5 @@
 import { offerTerms } from "../engine/offers.js";
-import { feeText, money, shortDate, wholeDollars } from "../engine/text.js";
+import { capitalize, feeText, money, shortDate, wholeDollars, } from "../engine/text.js";
 const TOP = 10;
 export function formatOffers(c, currencyName, all) {
     if (c.offers.length === 0) {
@@ -11,7 +11,7 @@ export function formatOffers(c, currencyName, all) {
     shown.forEach((o, i) => {
         const weeks = (o.months * 52) / 12;
         const pace = o.spend > 0 ? ` (about ${wholeDollars(o.spend / weeks)} a week)` : '';
-        lines.push(`${String(i + 1).padStart(2)}. ${o.cardName.padEnd(width)}  about ${wholeDollars(o.firstYearValue)} the first year`, `    ${offerTerms(o, currencyName(o.currency))}${pace}. ${feeText(o)[0]?.toUpperCase() ?? ''}${feeText(o).slice(1)}.${o.membershipFee > 0 ? ` Needs a ${money(o.membershipFee)} membership, counted in the first year.` : ''}${o.held ? ' In your wallet.' : ''}`);
+        lines.push(`${String(i + 1).padStart(2)}. ${o.cardName.padEnd(width)}  about ${wholeDollars(o.firstYearValue)} the first year`, `    ${offerTerms(o, currencyName(o.currency))}${pace}. ${capitalize(feeText(o))}.${o.membershipFee > 0 ? ` Needs a ${money(o.membershipFee)} membership, counted in the first year.` : ''}${o.held ? ' In your wallet.' : ''}`);
         lines.push(`    ${o.validTo ? `Offer ends ${shortDate(o.validTo)}. ` : ''}Public offer as of ${shortDate(o.lastVerified)}; yours may differ.`);
         if (o.ineligible)
             lines.push(`    ${o.ineligible}`);

package/dist/format/recommendation.js

@@ -1,4 +1,4 @@
-import { dollarsAndCents, money, pct } from "../engine/text.js";
+import { capitalize, dollarsAndCents, money, pct } from "../engine/text.js";
 import { noCardText } from "../engine/recommend.js";
 export const plain = (_format, text) => text;
 const TOP = 3;
@@ -55,7 +55,7 @@ export function formatRecommendation(rec, purchase, { all = false, style = plain
         const earned = top.earned === null ? '' : `, about ${dollarsAndCents(top.earned)}`;
         const confidence = rec.decision.confidence;
         const why = rec.bonus ? ' for its welcome bonus' : '';
-        lines.push(`${style('bold', `Use ${label(top)}${why}: ${pct(top.effectiveReturnPct)} back${earned}.`)} ${confidence[0]?.toUpperCase() ?? ''}${confidence.slice(1)} confidence.`);
+        lines.push(`${style('bold', `Use ${label(top)}${why}: ${pct(top.effectiveReturnPct)} back${earned}.`)} ${capitalize(confidence)} confidence.`);
         if (rec.bonus && rec.notes[0])
             lines.push(rec.notes[0]);
     }

package/dist/format/wallet.js

@@ -40,7 +40,7 @@ export function formatWalletSummary(summary) {
         return lines.join('\n');
     });
     const memberships = summary.memberships.length > 0
-        ? `Memberships: ${summary.memberships.join(', ')}.`
+        ? `Memberships: ${summary.memberships.map((id, i) => `${summary.membershipNames[i] ?? id} (${id})`).join(', ')}.`
         : 'Memberships: none saved.';
     const values = summary.pointValues.length > 0
         ? `Point values in the wallet: ${summary.pointValues.map((v) => `${v.name} at ${String(v.centsPerUnit)}¢${v.redemption === null ? '' : ` (redeemed ${v.redemption})`}`).join(', ')}. Others use earnrate's defaults.`

package/dist/import/analyze.js

@@ -1,4 +1,5 @@
 import { bonusStatus, countsTowardBonus } from "../engine/bonus.js";
+import { HALF_CENT } from "../engine/compare.js";
 import { capByKey, categoryMatches } from "../engine/evaluate.js";
 import { periodKey } from "../engine/periods.js";
 import { recommend } from "../engine/recommend.js";
@@ -155,7 +156,7 @@ export function analyzeStatement(catalog, wallet, entries, today, alreadyRecorde
         if (topBooking)
             simulated = applyBooking(simulated, topBooking);
         const gain = (top.earned ?? 0) - (used.earned ?? 0);
-        if (top.cardId !== cardId && gain > 0.005) {
+        if (top.cardId !== cardId && gain > HALF_CENT) {
             const key = `${name}|${cardId}|${top.cardId}`;
             const miss = missed.get(key) ?? {
                 merchant: name,

package/dist/mcp/context.js

@@ -1,7 +1,8 @@
 import { walletProblems } from "../data/integrity.js";
 import { EMPTY_WALLET, walletFromCards } from "../engine/transient.js";
+import { capitalize } from "../engine/text.js";
 import { formatNotes } from "../format/cards.js";
-import { resolveMerchant, withCallerCategory } from "../merchants/resolve.js";
+import { resolvePlace, withCallerCategory } from "../merchants/resolve.js";
 import { defined } from "./inputs.js";
 export const fail = (text) => ({
     content: [{ type: 'text', text }],
@@ -15,9 +16,22 @@ export function makeContext(deps) {
     const theWallet = deps.savedWallets === 'file'
         ? `the wallet at ${deps.store.where}`
         : 'the saved wallet';
+    // Which wallet this server keeps, for replies and tool descriptions. The
+    // local extension and the hosted connector can both be connected at once,
+    // each with its own wallet, and their tools are otherwise identical.
+    const walletName = deps.savedWallets === 'file'
+        ? `the wallet file on this computer (${deps.store.where})`
+        : 'your hosted earnrate wallet';
+    const walletUse = deps.savedWallets === 'file'
+        ? "It uses the wallet file on this computer, not the hosted earnrate connector's wallet."
+        : "It uses the user's hosted earnrate wallet, not a wallet file on their computer.";
+    const startHint = 'Answers cover every card, or the cards the user names. If the user wants their cards remembered, find each with search_cards and save it with add_card.';
+    const noCards = deps.savedWallets === 'file'
+        ? `The wallet at ${deps.store.where} has no cards yet. ${startHint}`
+        : `The user's saved wallet has no cards yet. ${startHint}`;
     const noWallet = deps.savedWallets === 'file'
         ? `There's no saved wallet yet (${deps.store.where}). Answers don't need one: they cover every card, or the cards the user names. If the user wants their cards remembered, find each with search_cards and save it with add_card.`
-        : "The user's saved wallet has no cards yet. Answers cover every card, or the cards the user names. If the user wants their cards remembered, find each with search_cards and save it with add_card.";
+        : noCards;
     // Read on every call, so edits to the wallet apply without a restart.
     async function wallet() {
         let loaded;
@@ -32,21 +46,21 @@ export function makeContext(deps) {
         }
         const problems = walletProblems(loaded, catalog);
         return problems.length > 0
-            ? `${theWallet[0]?.toUpperCase() ?? ''}${theWallet.slice(1)} has problems:\n${problems.map((p) => `- ${p}`).join('\n')}`
+            ? `${capitalize(theWallet)} has problems:\n${problems.map((p) => `- ${p}`).join('\n')}`
             : loaded;
     }
-    // No saved wallet is the normal state, not a failure: it reads as an
-    // empty one, with a note on how to start one.
+    // No saved wallet, or one with no cards, is the normal state, not a
+    // failure: it reads as an empty one, with a note on how to add cards.
     async function readableWallet() {
         const w = await wallet();
         if (typeof w !== 'string')
-            return { wallet: w, start: null };
+            return { wallet: w, start: w.cards.length === 0 ? noCards : null };
         return w === noWallet ? { wallet: EMPTY_WALLET, start: w } : w;
     }
     // The caller's category is free and comes before the paid Claude fallback;
     // neither ever overrides a merchant earnrate already knows.
     async function resolve(merchant, channel, category) {
-        const known = resolveMerchant(catalog, merchant, channel);
+        const known = resolvePlace(catalog, merchant, channel);
         if (known.source !== 'none' || category !== null || !deps.llm) {
             return { merchant: withCallerCategory(known, category), notices: [] };
         }
@@ -101,8 +115,8 @@ export function makeContext(deps) {
         const text = [
             message,
             output.cardIds.length > 0
-                ? `Wallet: ${output.cardIds.join(', ')}.`
-                : 'The wallet has no cards now; answers cover every card.',
+                ? `Saved in ${walletName}, which has ${String(output.cardIds.length)} ${output.cardIds.length === 1 ? 'card' : 'cards'}.`
+                : `Saved in ${walletName}, which has no cards now; answers cover every card.`,
             ...(notes ? [formatNotes(result.notes)] : []),
         ].join('\n');
         return {
@@ -111,7 +125,14 @@ export function makeContext(deps) {
         };
     }
     const cardName = (id) => catalog.cards.find((c) => c.id === id)?.name ?? id;
+    // The first line of an answer from the user's own cards: which ones.
+    const fromCards = (named) => named !== undefined && named.length > 0
+        ? 'For the cards named in this conversation.\n'
+        : `From ${walletName}.\n`;
     return {
+        walletName,
+        fromCards,
+        walletUse,
         wallet,
         readableWallet,
         resolve,

package/dist/mcp/inputs.js

@@ -6,7 +6,7 @@ import { IsoDate } from "../schema/common.js";
 export const Merchant = z
     .string()
     .min(1)
-    .describe('Merchant name or web address as the user would say it or see it, e.g. "Whole Foods" or "delta.com".');
+    .describe('Merchant name or web address as the user would say it or see it, e.g. "Whole Foods" or "delta.com", or a kind of place, e.g. "restaurants" or "gas station".');
 export const ChannelInput = z
     .enum(['online', 'in_store'])
     .optional()

package/dist/mcp/schemas.js

@@ -78,6 +78,7 @@ const RecommendationSchema = z.object({
 });
 export const WalletSummarySchema = z.object({
     memberships: z.array(z.string()),
+    membershipNames: z.array(z.string()),
     pointValues: z.array(z.object({
         currency: z.string(),
         name: z.string(),

package/dist/mcp/server.js

@@ -33,11 +33,17 @@ const SAVING = {
     file: 'Only if they want earnrate to remember their cards, track spending caps or welcome bonuses, or record purchases, save a wallet with add_card and the other wallet tools.',
     account: "The user signed in to earnrate when they connected it, to an anonymous saved wallet (no email or name). It may have no cards yet; answers then cover every card. Save cards with add_card only when the user agrees. The wallet can change outside this conversation when the user signs in again on earnrate's page, so read it with list_wallet rather than from memory. To use a different wallet or start a new one, call switch_wallet; the user then connects on earnrate's page with that wallet's recovery code. Never ask for the recovery code in the conversation; it's typed only on earnrate's page. To change the code, the user opens https://mcp.earnrate.dev/change-code. earnrate.dev and the earnrate command line keep their own separate wallets; export_wallet and import_wallet move one between them.",
 };
+const WHICH_WALLET = {
+    file: "This server's saved wallet is a file on the user's computer.",
+    account: "This server's saved wallet is hosted by earnrate, not a file on the user's computer.",
+};
 const instructions = (savedWallets) => `earnrate answers which credit card earns the most for a purchase, from each issuer's own terms. Anyone can use it without entering anything: with no cards given, best_card_for_purchase, best_cards_for, cheat_sheet, simulate_spending and compare_welcome_offers answer from every card earnrate knows, and that's a complete answer. Never require the user's cards, and don't ask what they spend unless the answer depends on it; simulate_spending assumes typical amounts when none are given and says so.
 
 Personalizing is optional. If the user names their cards, pass them as \`cards\` (ids from search_cards) for that answer; nothing is saved. After answering, offer once to save those cards so earnrate remembers them, and save them with add_card only if the user says yes. ${SAVING[savedWallets]} When a card needs category picks, memberships like Amazon Prime, or activations, ask the user rather than guessing.
 
-The wallet lists cards by product id, never card numbers; never ask for card numbers, expiry dates or security codes.`;
+The wallet lists cards by product id, never card numbers; never ask for card numbers, expiry dates or security codes.
+
+${WHICH_WALLET[savedWallets]} The earnrate extension on the user's computer and the hosted earnrate connector keep separate wallets with the same tools. If both are connected, say which wallet an answer comes from, and ask the user which one to use before saving or recording anything.`;
 export function createEarnrateServer(deps) {
     const server = new McpServer({ name: MCP_SERVER_NAME, version: deps.version }, { instructions: instructions(deps.savedWallets) });
     const ctx = makeContext(deps);