earnrate 0.1.4 → 0.2.0

package/dist/mcp/server.js

@@ -3,26 +3,46 @@ import { z } from 'zod';
 import { MCP_SERVER_NAME } from "../brand.js";
 import { formatCardInfo, formatNotes } from "../cli/cards.js";
 import { formatRecommendation } from "../cli/format.js";
-import { formatCheatSheet } from "../cli/cheatsheet.js";
-import { formatAdditions, formatCatalogSimulation, formatExploration, } from "../cli/explore.js";
-import { formatOffers } from "../cli/offers.js";
+import { formatCheatSheet } from "../format/cheat-sheet.js";
+import { formatAdditions, formatCatalogSimulation, formatExploration, } from "../format/explore.js";
+import { formatOffers } from "../format/offers.js";
+import { parseWalletYaml, walletYaml } from "../format/wallet-yaml.js";
 import { walletProblems } from "../data/integrity.js";
-import { loadWallet } from "../data/load.js";
-import { withWalletLock, writeBonusSpent, writeCapBooking, } from "../data/wallet-write.js";
-import { addCard, removeCard, setMemberships, updateCard, } from "../data/wallet-setup.js";
-import { bonusStatus, countsTowardBonus } from "../engine/bonus.js";
-import { cheatSheet } from "../engine/cheat-sheet.js";
+import { catalogCheatSheet, cheatSheet } from "../engine/cheat-sheet.js";
 import { ALL_PERSONAL_CARDS, exploreCards } from "../engine/explore.js";
+import { walletFromCards } from "../engine/transient.js";
 import { compareOffers } from "../engine/offers.js";
 import { VALUATION_PROFILES } from "../engine/profiles.js";
-import { capBooking } from "../engine/record.js";
 import { recommend } from "../engine/recommend.js";
-import { resolveSpendLines, simulateAdditions, simulateCatalog, } from "../engine/simulate.js";
+import { resolveSpendLines, simulateAdditions, simulateCatalog, TYPICAL_SPEND_NOTE, typicalSpendLines, } from "../engine/simulate.js";
 import { knownMemberships, searchCards } from "../engine/setup.js";
 import { walletSummary } from "../engine/wallet-summary.js";
 import { resolveMerchant, withCallerCategory } from "../merchants/resolve.js";
 import { IsoDate } from "../schema/common.js";
-import { CardSearchSchema, CheatSheetSchema, ExplorationSchema, MerchantResolutionSchema, SpendingSimulationSchema, RecommendationSchema, OfferComparisonSchema, RecordResultSchema, WalletChangeSchema, WalletSummarySchema, } from "./schemas.js";
+import { CardSearchSchema, CheatSheetSchema, ExplorationSchema, MerchantResolutionSchema, PurchaseAnswerSchema, SpendingSimulationSchema, OfferComparisonSchema, RecordResultSchema, WalletChangeSchema, WalletSummarySchema, } from "./schemas.js";
+// The tools that answer without a saved wallet.
+export const ANSWER_TOOLS = [
+    'best_card_for_purchase',
+    'best_cards_for',
+    'simulate_spending',
+    'compare_welcome_offers',
+    'cheat_sheet',
+    'resolve_merchant',
+    'search_cards',
+];
+// The tools that read or change a saved wallet. The remote server asks for
+// sign-in before running one.
+export const SAVED_WALLET_TOOLS = [
+    'list_wallet',
+    'record_purchase',
+    'add_card',
+    'update_card',
+    'remove_card',
+    'set_memberships',
+    'export_wallet',
+    'import_wallet',
+    'delete_wallet',
+];
 const Merchant = z
     .string()
     .min(1)
@@ -32,33 +52,42 @@ const ChannelInput = z
     .optional()
     .describe('How the purchase is made. Omit if unknown; the answer says what it assumed.');
 const DateInput = IsoDate.optional().describe('Purchase date, YYYY-MM-DD. Defaults to today.');
-const INSTRUCTIONS = `earnrate picks which of the user's credit cards earns the most for a purchase. best_cards_for and simulate_spending compare every card earnrate knows and need no wallet, for questions like "what's the best grocery card?" or "which cards fit my spending?". Its wallet lists the cards they hold by product id, never card numbers; never ask for card numbers, expiry dates or security codes.
+const SAVING = {
+    none: "This server doesn't save wallets: pass the cards each time. For a saved wallet with cap and welcome-bonus tracking, the user can install earnrate locally (earnrate.dev).",
+    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: "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. Saved wallets are anonymous: the first wallet tool asks the user to open an earnrate page, where they start a wallet (it shows a recovery code to keep; no email or name) or reconnect one with their code. Never ask for the recovery code in the conversation; it's typed only on that page. To change the code, the user opens https://mcp.earnrate.dev/change-code.",
+};
+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.
 
-If a tool says there's no wallet yet, ask the user which cards they have, find each with search_cards, and add it with add_card. add_card and update_card reply with what a card still needs, such as category picks, memberships like Amazon Prime, or activated bonus categories. Ask the user about those and set them with update_card or set_memberships.`;
+Personalizing is optional. If the user names their cards, pass them as \`cards\` (ids from search_cards) for that answer; nothing is saved. ${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.`;
 const fail = (text) => ({
     content: [{ type: 'text', text }],
     isError: true,
 });
 const dollars = (n) => `$${n.toLocaleString('en-US', { maximumFractionDigits: 2 })}`;
 export function createEarnrateServer(deps) {
-    const server = new McpServer({ name: MCP_SERVER_NAME, version: deps.version }, { instructions: INSTRUCTIONS });
+    const server = new McpServer({ name: MCP_SERVER_NAME, version: deps.version }, { instructions: INSTRUCTIONS(deps.savedWallets) });
     const { catalog } = deps;
-    const noWallet = `There's no wallet yet (${deps.walletFile}), which is normal before the user adds a card. Ask the user which credit cards they have, find each one with search_cards, and add it with add_card. best_cards_for and simulate_spending work without a wallet.`;
-    // Read on every call, so edits to the wallet file apply without a restart.
+    // Tools that need a saved wallet; a server without saved wallets drops them.
+    const walletTools = [];
+    const noWallet = `There's no wallet yet (${deps.store.where}), which is normal before the user adds a card. Ask the user which credit cards they have, find each one with search_cards, and add it with add_card. best_cards_for and simulate_spending work without a wallet.`;
+    // Read on every call, so edits to the wallet apply without a restart.
     async function wallet() {
         let loaded;
         try {
-            loaded = await loadWallet(deps.walletFile);
+            const found = await deps.store.load();
+            if (found === null)
+                return noWallet;
+            loaded = found;
         }
         catch (e) {
-            if (e instanceof Error && 'code' in e && e.code === 'ENOENT') {
-                return noWallet;
-            }
-            return `Couldn't read the wallet at ${deps.walletFile}: ${e instanceof Error ? e.message : String(e)}`;
+            return `Couldn't read the wallet at ${deps.store.where}: ${e instanceof Error ? e.message : String(e)}`;
         }
         const problems = walletProblems(loaded, catalog);
         return problems.length > 0
-            ? `The wallet at ${deps.walletFile} has problems:\n${problems.map((p) => `- ${p}`).join('\n')}`
+            ? `The wallet at ${deps.store.where} has problems:\n${problems.map((p) => `- ${p}`).join('\n')}`
             : loaded;
     }
     // No wallet yet is the first-run state, not a failure: read-only tools
@@ -85,9 +114,50 @@ export function createEarnrateServer(deps) {
         .enum(ids)
         .optional()
         .describe(`Only for a merchant earnrate may not know, and only if you're confident what kind of business it is: its spending category, e.g. grocery.supermarket for a supermarket, dining for a restaurant, gas for a gas station. Ignored when earnrate knows the merchant. Leave it out if unsure. Categories: ${catalog.categories.map((c) => `${c.id} (${c.name})`).join(', ')}.`);
+    const namedMembershipIds = knownMemberships(catalog);
+    const NamedCardsInput = z
+        .array(z.object({
+        cardId: z.string().min(1).describe('A card id from search_cards.'),
+        picks: z
+            .record(z.string(), z.array(z.string()).min(1))
+            .optional()
+            .describe("Bonus categories the user picked, for cards that have them: choice id → option ids, from search_cards. Ask; don't guess."),
+        activated: z
+            .array(z.string())
+            .optional()
+            .describe('Bonuses the user has activated with the issuer, as rule ids from search_cards.'),
+    }))
+        .optional()
+        .describe("Cards the user named in this conversation, to answer for just those cards without saving anything. Leave out to use the user's saved wallet if they have one; with neither, the answer covers every card earnrate knows.");
+    const NamedMembershipsInput = z
+        .array(z.enum(namedMembershipIds))
+        .optional()
+        .describe("Memberships the user has, such as amazon-prime, when they're named in the conversation rather than saved.");
+    const ALL_CARDS_NOTE = "The user hasn't named their cards, so this covers every card earnrate knows. That's a complete answer. If they want the best of their own cards, they can name them (pass them as `cards`); saving a wallet is optional.";
+    // Cards named in the conversation come first, then the saved wallet; with
+    // neither, read tools answer from every card earnrate knows.
+    async function sourceFor(cards, memberships) {
+        if (cards && cards.length > 0) {
+            const w = walletFromCards(catalog, {
+                cards: cards.map((c) => ({
+                    id: c.cardId,
+                    ...(c.picks ? { picks: c.picks } : {}),
+                    ...(c.activated ? { activated: c.activated } : {}),
+                })),
+                ...(memberships ? { memberships } : {}),
+            }, deps.today());
+            return typeof w === 'string' ? w : { wallet: w, named: true };
+        }
+        const read = await readableWallet();
+        if (typeof read === 'string')
+            return read;
+        return read.start !== null
+            ? { wallet: null }
+            : { wallet: read.wallet, named: false };
+    }
     server.registerTool('best_card_for_purchase', {
         title: 'Best card for a purchase',
-        description: "Picks the card in the user's wallet that earns the most rewards for a purchase, and explains why. Call it before paying. `decision.cardId` is the pick and `decision.checkoutLabel` is how the card appears at checkout. Also returns every usable card ranked with reasons, cards the merchant won't take, the assumptions made, warnings, and when a different point valuation would change the pick. Never needs or returns card numbers.",
+        description: "Which card earns the most rewards for a purchase, and why. With no cards given and no saved wallet, it ranks every card earnrate knows (in `allCards`): a complete answer for anyone. With cards named in the conversation (`cards`) or a saved wallet, it picks the best of the user's own: `decision.cardId` is the pick and `decision.checkoutLabel` is how the card appears at checkout, with every usable card ranked with reasons, cards the merchant won't take, assumptions, warnings, and when a different point valuation would change the pick. Never needs or returns card numbers.",
         inputSchema: z.object({
             merchant: Merchant,
             amount: z
@@ -98,17 +168,18 @@ export function createEarnrateServer(deps) {
             channel: ChannelInput,
             date: DateInput,
             category: CategoryInput,
+            cards: NamedCardsInput,
+            memberships: NamedMembershipsInput,
         }),
-        outputSchema: RecommendationSchema,
+        outputSchema: PurchaseAnswerSchema,
         annotations: {
             readOnlyHint: true,
             openWorldHint: deps.llm !== null,
         },
-    }, async ({ merchant, amount, channel, date, category }) => {
-        const read = await readableWallet();
-        if (typeof read === 'string')
-            return fail(read);
-        const w = read.wallet;
+    }, async ({ merchant, amount, channel, date, category, cards, memberships, }) => {
+        const source = await sourceFor(cards, memberships);
+        if (typeof source === 'string')
+            return fail(source);
         const purchase = {
             merchant,
             amount: amount ?? null,
@@ -117,20 +188,35 @@ export function createEarnrateServer(deps) {
             country: 'US',
         };
         const resolved = await resolve(merchant, purchase.channel, category ?? null);
-        const rec = recommend(catalog, w, purchase, resolved.merchant);
-        if (read.start !== null) {
-            const output = {
-                ...rec,
-                warnings: [read.start, ...resolved.notices],
-            };
+        if (source.wallet === null) {
+            const explored = exploreCards(catalog, {
+                merchant,
+                category: null,
+                amount: purchase.amount,
+                channel: purchase.channel,
+                date: purchase.date,
+            }, { ...settings({}), memberships: memberships ?? [] }, resolved.merchant);
+            const allCards = { ...explored, ranked: explored.ranked.slice(0, 10) };
+            const empty = recommend(catalog, { valuations: {}, memberships: [], cards: [] }, purchase, resolved.merchant);
             return {
-                content: [{ type: 'text', text: read.start }],
-                structuredContent: output,
+                content: [
+                    {
+                        type: 'text',
+                        text: `${formatExploration(allCards, true)}\n${ALL_CARDS_NOTE}`,
+                    },
+                ],
+                structuredContent: {
+                    ...empty,
+                    warnings: [ALL_CARDS_NOTE, ...resolved.notices],
+                    allCards,
+                },
             };
         }
+        const rec = recommend(catalog, source.wallet, purchase, resolved.merchant);
         const output = {
             ...rec,
             warnings: [...rec.warnings, ...resolved.notices],
+            allCards: null,
         };
         return {
             content: [
@@ -164,7 +250,7 @@ export function createEarnrateServer(deps) {
             structuredContent: m,
         };
     });
-    server.registerTool('list_wallet', {
+    walletTools.push(server.registerTool('list_wallet', {
         title: 'List wallet',
         description: "Lists the user's cards: checkout label, network, rewards currency and its value, spending caps with how much is left this period, chosen bonus categories (and whether they're current), welcome-bonus progress, which stores a store card works at, and when each card's data was last verified.",
         outputSchema: WalletSummarySchema,
@@ -186,7 +272,9 @@ export function createEarnrateServer(deps) {
             const chosen = c.chosen
                 ? `; chosen categories for ${c.chosen.period}${c.chosen.current ? '' : ' (out of date)'}`
                 : '';
-            const onlyAt = c.onlyAt ? `; works only at ${c.onlyAt.join(', ')}` : '';
+            const onlyAt = c.onlyAt
+                ? `; works only at ${c.onlyAt.join(', ')}`
+                : '';
             const rotation = c.rotationGap === null
                 ? ''
                 : `; rotating categories for ${c.rotationGap} not in earnrate yet`;
@@ -202,7 +290,7 @@ export function createEarnrateServer(deps) {
             content: [{ type: 'text', text: lines.join('\n') }],
             structuredContent: summary,
         };
-    });
+    }));
     server.registerTool('compare_welcome_offers', {
         title: 'Compare welcome offers',
         description: "Ranks the public welcome (sign-up) offers on cards the user doesn't have by first-year value: the bonus at the user's point values minus the first year's annual fee. Use it when the user asks which new card to get or which has the best sign-up bonus. It covers only the cards earnrate knows, offers vary by person, and each offer's note gives the issuer's eligibility rules; pass those caveats on. It doesn't account for what a card would earn on the user's spending.",
@@ -223,14 +311,15 @@ export function createEarnrateServer(deps) {
                 .boolean()
                 .optional()
                 .describe('Include cards already in the wallet.'),
+            cards: NamedCardsInput,
         }),
         outputSchema: OfferComparisonSchema,
         annotations: { readOnlyHint: true, openWorldHint: false },
     }, async (args) => {
-        const read = await readableWallet();
-        if (typeof read === 'string')
-            return fail(read);
-        const comparison = compareOffers(catalog, read.wallet, {
+        const source = await sourceFor(args.cards, undefined);
+        if (typeof source === 'string')
+            return fail(source);
+        const comparison = compareOffers(catalog, source.wallet ?? { valuations: {}, memberships: [], cards: [] }, {
             kind: args.kind ?? 'any',
             noAnnualFee: args.noAnnualFee ?? false,
             business: args.business ?? false,
@@ -317,7 +406,7 @@ export function createEarnrateServer(deps) {
     });
     server.registerTool('simulate_spending', {
         title: 'Simulate a year of spending',
-        description: 'Spends the user\'s monthly amounts for a year across every card earnrate knows, and ranks single cards and two-card pairs by rewards minus annual fees. With compareToWallet, it starts from the user\'s wallet and ranks the cards that would add the most to it. Use it for "which card fits my spending?" or "is it worth adding a card?". Ask for rough monthly amounts if the user hasn\'t given them. It leaves out welcome bonuses.',
+        description: 'Spends monthly amounts for a year across every card earnrate knows, and ranks single cards and two-card pairs by rewards minus annual fees. Spending is optional: without it, typical U.S. household amounts are used and the answer says so. With `cards` (named in the conversation) or compareToWallet (the saved wallet), it ranks the cards that would add the most to those cards instead. Use it for "which card fits my spending?" or "is it worth adding a card?". It leaves out welcome bonuses.',
         inputSchema: z.object({
             spending: z
                 .array(z.object({
@@ -325,33 +414,42 @@ export function createEarnrateServer(deps) {
                 category: CatalogCategory.optional(),
                 monthly: z.number().positive().describe('US dollars a month.'),
             }))
-                .min(1)
-                .describe('Monthly spending lines, each a category (grocery.supermarket, dining, gas, other) or a merchant (Amazon, Costco).'),
+                .optional()
+                .describe("Monthly spending lines, each a category (grocery.supermarket, dining, gas, other) or a merchant (Amazon, Costco). Optional: leave out to use typical amounts, and don't press the user for numbers they haven't offered."),
+            cards: NamedCardsInput,
             compareToWallet: z
                 .boolean()
                 .optional()
-                .describe("Rank the cards that would add the most to the user's wallet."),
+                .describe("Rank the cards that would add the most to the user's saved wallet."),
             ...CatalogFilters,
         }),
         outputSchema: SpendingSimulationSchema,
         annotations: { readOnlyHint: true, openWorldHint: false },
     }, async (args) => {
-        if (args.spending.some((l) => l.merchant === undefined && l.category === undefined))
+        const given = args.spending ?? [];
+        if (given.some((l) => l.merchant === undefined && l.category === undefined))
             return fail('Each spending line needs a merchant or a category.');
-        const lines = resolveSpendLines(catalog, args.spending.map((l) => ({
-            merchant: l.merchant ?? null,
-            category: l.merchant === undefined ? (l.category ?? null) : null,
-            monthly: l.monthly,
-        })));
+        const lines = given.length === 0
+            ? typicalSpendLines(catalog)
+            : resolveSpendLines(catalog, given.map((l) => ({
+                merchant: l.merchant ?? null,
+                category: l.merchant === undefined ? (l.category ?? null) : null,
+                monthly: l.monthly,
+            })));
         const unknown = lines.filter((l) => l.merchant.source === 'none');
         if (unknown.length > 0)
             return fail(`earnrate doesn't know ${unknown.map((l) => `"${l.merchant.input}"`).join(', ')}. Give a category for those lines instead.`);
+        const notes = given.length === 0 ? [TYPICAL_SPEND_NOTE] : [];
         const options = { ...settings(args), start: deps.today() };
-        const read = args.compareToWallet ? await readableWallet() : null;
-        if (typeof read === 'string')
-            return fail(read);
-        if (read && read.start === null) {
-            const w = read.wallet;
+        const wantsTheirs = (args.cards !== undefined && args.cards.length > 0) ||
+            args.compareToWallet === true;
+        const source = wantsTheirs
+            ? await sourceFor(args.cards, args.memberships)
+            : null;
+        if (typeof source === 'string')
+            return fail(source);
+        if (source && source.wallet !== null) {
+            const w = source.wallet;
             const valued = args.valuation
                 ? {
                     ...w,
@@ -362,11 +460,11 @@ export function createEarnrateServer(deps) {
                 }
                 : w;
             const result = simulateAdditions(catalog, valued, lines, options);
+            const text = formatAdditions(result, catalog, false);
             return {
-                content: [
-                    { type: 'text', text: formatAdditions(result, catalog, false) },
-                ],
+                content: [{ type: 'text', text: [...notes, text].join('\n\n') }],
                 structuredContent: {
+                    notes,
                     singles: [],
                     pairs: [],
                     current: result.current,
@@ -376,16 +474,14 @@ export function createEarnrateServer(deps) {
                 },
             };
         }
+        if (source)
+            notes.push(ALL_CARDS_NOTE);
         const result = simulateCatalog(catalog, lines, options);
         const text = formatCatalogSimulation(result, catalog, false);
         return {
-            content: [
-                {
-                    type: 'text',
-                    text: read?.start ? `${read.start}\n\n${text}` : text,
-                },
-            ],
+            content: [{ type: 'text', text: [...notes, text].join('\n\n') }],
             structuredContent: {
+                notes,
                 singles: result.singles.slice(0, 10),
                 pairs: result.pairs.slice(0, 5),
                 current: null,
@@ -395,26 +491,37 @@ export function createEarnrateServer(deps) {
     });
     server.registerTool('cheat_sheet', {
         title: 'Cheat sheet',
-        description: "The card in the user's wallet to use for each everyday kind of purchase right now: groceries, dining, gas, Amazon, Costco, travel, streaming, drugstores and everything else, with caps, picks and activations as the wallet has them. Use it when the user asks which card to use for what, or wants a quick reference for the quarter. For one specific store, call best_card_for_purchase instead. Pass on the notes: they say what the wallet still needs, like this quarter's picks.",
-        inputSchema: z.object({ date: DateInput }),
+        description: "The card to use for each everyday kind of purchase right now: groceries, dining, gas, Amazon, Costco, travel, streaming, drugstores and everything else. With no cards given and no saved wallet, it picks from every card earnrate knows (`scope: all cards`, each row noting the card's fee and conditions). With cards named in the conversation or a saved wallet, it picks from the user's own cards, with caps, picks and activations as they are. For one specific store, call best_card_for_purchase instead. Pass on the notes.",
+        inputSchema: z.object({
+            date: DateInput,
+            cards: NamedCardsInput,
+            memberships: NamedMembershipsInput,
+        }),
         outputSchema: CheatSheetSchema,
         annotations: { readOnlyHint: true, openWorldHint: false },
     }, async (args) => {
-        const read = await readableWallet();
-        if (typeof read === 'string')
-            return fail(read);
-        const sheet = cheatSheet(catalog, read.wallet, args.date ?? deps.today());
-        if (read.start !== null)
+        const source = await sourceFor(args.cards, args.memberships);
+        if (typeof source === 'string')
+            return fail(source);
+        const date = args.date ?? deps.today();
+        if (source.wallet === null) {
+            const sheet = catalogCheatSheet(catalog, date, {
+                ...settings({}),
+                memberships: args.memberships ?? [],
+            });
+            const withNote = { ...sheet, notes: [ALL_CARDS_NOTE] };
             return {
-                content: [{ type: 'text', text: read.start }],
-                structuredContent: { ...sheet, notes: [read.start] },
+                content: [{ type: 'text', text: formatCheatSheet(withNote) }],
+                structuredContent: withNote,
             };
+        }
+        const sheet = cheatSheet(catalog, source.wallet, date);
         return {
             content: [{ type: 'text', text: formatCheatSheet(sheet) }],
             structuredContent: sheet,
         };
     });
-    server.registerTool('record_purchase', {
+    walletTools.push(server.registerTool('record_purchase', {
         title: 'Record a purchase',
         description: "Records a purchase the user has already made, so spending caps and welcome-bonus progress stay accurate for future recommendations. It updates the user's wallet file. Only call it after the purchase has happened, and only once per purchase: calling it twice counts the spend twice. Purchases with no cap and no open welcome bonus are acknowledged and nothing is written.",
         inputSchema: z.object({
@@ -438,7 +545,7 @@ export function createEarnrateServer(deps) {
     }, 
     // Queued per wallet file: parallel calls would otherwise each read the
     // old usage and the last write would drop the others' spend.
-    (args) => withWalletLock(deps.walletFile, async () => {
+    (args) => (async () => {
         const { cardId, merchant, amount, channel, date, category } = args;
         const w = await wallet();
         if (typeof w === 'string')
@@ -454,23 +561,10 @@ export function createEarnrateServer(deps) {
             date: date ?? deps.today(),
         };
         const resolved = await resolve(merchant, purchase.channel, category ?? null);
-        const booking = capBooking(catalog, w, purchase, resolved.merchant);
-        const held = w.cards.find((c) => c.id === cardId);
-        const status = held
-            ? bonusStatus(catalog, w, held, purchase.date)
-            : null;
-        const bonus = status &&
-            status.spend !== null &&
-            (status.remaining ?? 0) > 0 &&
-            countsTowardBonus(status, purchase.date)
-            ? {
-                cardId,
-                before: status.spent,
-                after: Math.round((status.spent + amount) * 100) / 100,
-                spend: status.spend,
-                deadline: status.deadline,
-            }
-            : null;
+        const result = await deps.store.record(purchase, resolved.merchant);
+        if (!result.ok)
+            return fail(`Couldn't record it: ${result.error}`);
+        const { cap: booking, bonus } = result;
         if (!booking && !bonus) {
             const output = {
                 recorded: false,
@@ -483,15 +577,6 @@ export function createEarnrateServer(deps) {
                 structuredContent: output,
             };
         }
-        try {
-            if (booking)
-                await writeCapBooking(deps.walletFile, booking);
-            if (bonus)
-                await writeBonusSpent(deps.walletFile, cardId, bonus.after);
-        }
-        catch (e) {
-            return fail(`Couldn't record it: ${e instanceof Error ? e.message : String(e)}`);
-        }
         const messages = [];
         if (booking) {
             const left = Math.max(0, booking.capAmount - booking.after);
@@ -518,7 +603,7 @@ export function createEarnrateServer(deps) {
             ],
             structuredContent: output,
         };
-    }));
+    })()));
     const CardId = z
         .string()
         .min(1)
@@ -542,6 +627,24 @@ export function createEarnrateServer(deps) {
             .array(z.string())
             .optional()
             .describe('Rule ids the user has activated with the issuer, such as rotating categories. Replaces the current list.'),
+        bonus: z
+            .object({
+            opened: IsoDate.describe('The day the account opened, YYYY-MM-DD.'),
+            spent: z
+                .number()
+                .nonnegative()
+                .optional()
+                .describe('Dollars already spent toward the bonus. Default 0.'),
+            spend: z
+                .number()
+                .positive()
+                .optional()
+                .describe("Dollars of spending the bonus needs, only if the user's offer differs from the published one."),
+            by: IsoDate.optional().describe("The deadline, YYYY-MM-DD, only if the user's offer differs from the published one."),
+        })
+            .nullable()
+            .optional()
+            .describe("A welcome bonus the user is working toward, so purchases recorded on this card count toward it and answers can favor it. Ask when they opened the account; spending needed and the deadline default to the card's published offer. null stops tracking it."),
     };
     // A card change reports what that card still needs; other changes don't.
     function changed(result, message, cardChange = true) {
@@ -574,6 +677,22 @@ export function createEarnrateServer(deps) {
             ? {}
             : { anniversary: args.anniversary }),
         ...(args.activated === undefined ? {} : { activated: args.activated }),
+        ...(args.bonus === undefined
+            ? {}
+            : {
+                bonus: args.bonus === null
+                    ? null
+                    : {
+                        opened: args.bonus.opened,
+                        ...(args.bonus.spent === undefined
+                            ? {}
+                            : { spent: args.bonus.spent }),
+                        ...(args.bonus.spend === undefined
+                            ? {}
+                            : { spend: args.bonus.spend }),
+                        ...(args.bonus.by === undefined ? {} : { by: args.bonus.by }),
+                    },
+            }),
     });
     const cardName = (id) => catalog.cards.find((c) => c.id === id)?.name ?? id;
     server.registerTool('search_cards', {
@@ -588,7 +707,7 @@ export function createEarnrateServer(deps) {
         outputSchema: CardSearchSchema,
         annotations: { readOnlyHint: true, openWorldHint: false },
     }, async ({ query }) => {
-        const held = await loadWallet(deps.walletFile).catch(() => null);
+        const held = await deps.store.load().catch(() => null);
         const result = searchCards(catalog, query ?? '', held, deps.today());
         const header = result.exact
             ? ''
@@ -605,7 +724,7 @@ export function createEarnrateServer(deps) {
             structuredContent: result,
         };
     });
-    server.registerTool('add_card', {
+    walletTools.push(server.registerTool('add_card', {
         title: 'Add a card',
         description: "Adds a card the user holds to their wallet by its id from search_cards, creating the wallet if there isn't one. The reply says what the card still needs (category picks, memberships, activations); ask the user about those. Stores only the card's product id and settings, never card numbers.",
         inputSchema: z.object({ cardId: CardId, ...cardFields }),
@@ -616,11 +735,11 @@ export function createEarnrateServer(deps) {
             idempotentHint: false,
             openWorldHint: false,
         },
-    }, (args) => withWalletLock(deps.walletFile, async () => {
-        const result = await addCard(deps.walletFile, catalog, cardInput(args), deps.today());
-        return changed(result, `Added ${cardName(args.cardId)} (${args.cardId})${result.ok && result.created ? `, starting a new wallet at ${deps.walletFile}` : ''}.`);
+    }, async (args) => {
+        const result = await deps.store.addCard(cardInput(args), deps.today());
+        return changed(result, `Added ${cardName(args.cardId)} (${args.cardId})${result.ok && result.created ? (deps.savedWallets === 'account' ? ', the first card in your saved wallet' : `, starting a new wallet at ${deps.store.where}`) : ''}.`);
     }));
-    server.registerTool('update_card', {
+    walletTools.push(server.registerTool('update_card', {
         title: 'Update a card',
         description: 'Changes settings on a card already in the wallet: its category picks for this period, checkout label, anniversary or activated categories. Picks for the current period are merged with the ones already saved. Use it when the user picks new categories, such as each quarter on U.S. Bank Cash+.',
         inputSchema: z.object({ cardId: CardId, ...cardFields }),
@@ -631,8 +750,8 @@ export function createEarnrateServer(deps) {
             idempotentHint: true,
             openWorldHint: false,
         },
-    }, (args) => withWalletLock(deps.walletFile, async () => changed(await updateCard(deps.walletFile, catalog, cardInput(args), deps.today()), `Updated ${cardName(args.cardId)} (${args.cardId}).`)));
-    server.registerTool('remove_card', {
+    }, async (args) => changed(await deps.store.updateCard(cardInput(args), deps.today()), `Updated ${cardName(args.cardId)} (${args.cardId}).`)));
+    walletTools.push(server.registerTool('remove_card', {
         title: 'Remove a card',
         description: "Removes a card from the wallet, with its tracked cap usage and bonus progress. Only when the user says they no longer have it or don't want it considered.",
         inputSchema: z.object({ cardId: CardId }),
@@ -643,8 +762,8 @@ export function createEarnrateServer(deps) {
             idempotentHint: true,
             openWorldHint: false,
         },
-    }, ({ cardId }) => withWalletLock(deps.walletFile, async () => changed(await removeCard(deps.walletFile, catalog, cardId), `Removed ${cardName(cardId)} (${cardId}).`, false)));
-    server.registerTool('set_memberships', {
+    }, async ({ cardId }) => changed(await deps.store.removeCard(cardId), `Removed ${cardName(cardId)} (${cardId}).`, false)));
+    walletTools.push(server.registerTool('set_memberships', {
         title: 'Set memberships',
         description: "Sets the memberships that unlock some cards' rates, such as amazon-prime for Prime Visa's 5% or a Bank of America Preferred Rewards tier. Replaces the whole list, so include the ones to keep.",
         inputSchema: z.object({
@@ -659,8 +778,76 @@ export function createEarnrateServer(deps) {
             idempotentHint: true,
             openWorldHint: false,
         },
-    }, (args) => withWalletLock(deps.walletFile, async () => changed(await setMemberships(deps.walletFile, catalog, args.memberships), args.memberships.length > 0
+    }, async (args) => changed(await deps.store.setMemberships(args.memberships), args.memberships.length > 0
         ? `Memberships set to ${args.memberships.join(', ')}.`
         : 'Memberships cleared.', false)));
+    if (deps.savedWallets === 'account') {
+        const store = deps.store;
+        server.registerTool('export_wallet', {
+            title: 'Export the wallet',
+            description: 'The saved wallet as a wallet.yaml file the earnrate command line and earnrate.dev can import: card ids, picks, activations, memberships, cap usage and bonus progress. Never card numbers.',
+            inputSchema: z.object({}),
+            outputSchema: z.object({ yaml: z.string() }),
+            annotations: { readOnlyHint: true, openWorldHint: false },
+        }, async () => {
+            const w = await wallet();
+            if (typeof w === 'string')
+                return fail(w);
+            const yaml = walletYaml(w);
+            return {
+                content: [{ type: 'text', text: yaml }],
+                structuredContent: { yaml },
+            };
+        });
+        server.registerTool('import_wallet', {
+            title: 'Import a wallet',
+            description: 'Replaces the saved wallet with a wallet.yaml from the earnrate command line or earnrate.dev, when the user pastes or attaches one. Wallet files only: never statements or card numbers. Confirm with the user first if they already have cards saved.',
+            inputSchema: z.object({
+                yaml: z
+                    .string()
+                    .min(1)
+                    .max(100_000)
+                    .describe('The wallet.yaml text, as the user gave it.'),
+            }),
+            outputSchema: WalletChangeSchema,
+            annotations: {
+                readOnlyHint: false,
+                destructiveHint: true,
+                idempotentHint: true,
+                openWorldHint: false,
+            },
+        }, async ({ yaml }) => {
+            const parsed = parseWalletYaml(yaml, catalog);
+            if (typeof parsed === 'string')
+                return fail(parsed);
+            return changed(await store.replace(parsed), `Imported a wallet with ${String(parsed.cards.length)} ${parsed.cards.length === 1 ? 'card' : 'cards'}.`, false);
+        });
+        server.registerTool('delete_wallet', {
+            title: 'Delete the wallet',
+            description: 'Deletes the saved wallet now and for good, and signs out every app using it. Only when the user asks to delete it; confirm first, and offer export_wallet to keep a copy.',
+            inputSchema: z.object({}),
+            outputSchema: z.object({ deleted: z.boolean() }),
+            annotations: {
+                readOnlyHint: false,
+                destructiveHint: true,
+                idempotentHint: true,
+                openWorldHint: false,
+            },
+        }, async () => {
+            await store.erase();
+            return {
+                content: [
+                    {
+                        type: 'text',
+                        text: 'Deleted the saved wallet. Answers now cover every card, or the cards named in the conversation.',
+                    },
+                ],
+                structuredContent: { deleted: true },
+            };
+        });
+    }
+    if (deps.savedWallets === 'none')
+        for (const tool of walletTools)
+            tool.remove();
     return server;
 }