@seethruhead/cra-payroll 0.7.0 → 0.8.0

package/README.md

@@ -1,15 +1,36 @@
-# @seethruhead/cra-payroll
+# cra-payroll
 
 Calculate Canadian payroll deductions using CRA's [Payroll Deductions Online Calculator (PDOC)](https://apps.cra-arc.gc.ca/ebci/rhpd/beta/entry).
 
-Automates the CRA wizard via Puppeteer and returns your net pay, taxes, CPP, EI, and RRSP breakdown — per paycheck, monthly, or annually.
+Automates the CRA wizard via Playwright and returns your net pay, taxes, CPP, EI, and RRSP breakdown — per paycheck, monthly, or annually.
+
+## Download
+
+Grab the latest binary for your platform from [**Releases**](https://github.com/SeeThruHead/cra-payroll/releases):
+
+| Platform | File |
+|----------|------|
+| macOS (Apple Silicon) | `cra-payroll-darwin-arm64` |
+| macOS (Intel) | `cra-payroll-darwin-x64` |
+| Linux (x64) | `cra-payroll-linux-x64` |
+
+```bash
+# Example: macOS Apple Silicon
+curl -L -o cra-payroll https://github.com/SeeThruHead/cra-payroll/releases/latest/download/cra-payroll-darwin-arm64
+chmod +x cra-payroll
+
+# Remove macOS quarantine flag (unsigned binary)
+xattr -d com.apple.quarantine cra-payroll
+
+sudo mv cra-payroll /usr/local/bin/
+```
 
 > **Requires Google Chrome** — uses your system Chrome, no extra browser install needed.
 
-## Install
+Or use the one-liner:
 
 ```bash
-npm install -g @seethruhead/cra-payroll
+curl -fsSL https://raw.githubusercontent.com/SeeThruHead/cra-payroll/main/install.sh | bash
 ```
 
 ## Usage
@@ -22,7 +43,7 @@ cra-payroll
 cra-payroll --salary 120000 --province "British Columbia"
 
 # Per-paycheck table for the year (tracks CPP/EI maxout)
-cra-payroll --salary 263000 --table
+cra-payroll --salary 150000 --table
 
 # Annual totals
 cra-payroll --salary 100000 --annual
@@ -31,48 +52,59 @@ cra-payroll --salary 100000 --annual
 cra-payroll --salary 100000 --monthly
 
 # Combine them
-cra-payroll --salary 263000 --table --annual --monthly
+cra-payroll --salary 150000 --table --annual --monthly
+
+# Verbose logging
+cra-payroll -v --salary 100000
+
+# Check version
+cra-payroll --version
+
+# Self-update to latest release
+cra-payroll --update
 ```
 
 ### Example output (`--table`)
 
 ```
-Per-Paycheck Table (2026)
+📊 Per-Paycheck Table (2026)
 ══════════════════════════════════════════════════════════════════════════════════════════════
   #  │     Gross │   Fed Tax │  Prov Tax │       CPP │        EI │   Net Pay │ Cum CPP/EI
 ──────────────────────────────────────────────────────────────────────────────────────────────
-  1  │ 10,958.33 │  2,232.82 │  1,431.13 │    669.42 │    178.62 │  6,446.34 │    848.04
-  2  │ 10,958.33 │  2,232.82 │  1,431.13 │    669.42 │    178.62 │  6,446.34 │  1,696.08
+  1  │  6,250.00 │  1,028.37 │    612.45 │    382.51 │    102.08 │  4,124.59 │    484.59
+  2  │  6,250.00 │  1,028.37 │    612.45 │    382.51 │    102.08 │  4,124.59 │    969.18
  ... │       ... │       ... │       ... │       ... │       ... │       ... │       ...
-  7  │ 10,958.33 │  2,232.82 │  1,431.13 │    213.93 │     51.35 │  7,029.10 │  5,353.52 ← partial
-  8  │ 10,958.33 │  2,232.82 │  1,431.13 │      0.00 │      0.00 │  7,294.38 │  5,353.52 ✓ maxed
+ 11  │  6,250.00 │  1,028.37 │    612.45 │    112.50 │     19.37 │  4,477.31 │  5,353.52 ← partial
+ 12  │  6,250.00 │  1,028.37 │    612.45 │      0.00 │      0.00 │  4,609.18 │  5,353.52 ✓ maxed
  ... │       ... │       ... │       ... │       ... │       ... │       ... │       ...
 ```
 
 ## Config
 
-Create `~/.config/cra-payroll.json`:
+Config is loaded from the first file found:
+1. `--config <path>`
+2. `./config.json`
+3. `~/.config/cra-payroll.json`
+4. `~/.cra-payroll.json`
+
+CLI args override config file values. Missing values are prompted interactively.
 
 ```json
 {
   "province": "Ontario",
   "annualSalary": 100000,
   "payPeriod": "Semi-monthly (24 pay periods a year)",
-  "year": 2026,
   "rrspEmployeePercent": 4,
   "rrspEmployerPercent": 4
 }
 ```
 
-CLI args override config file values. Missing values are prompted interactively.
-
 ### Options
 
 | Option | CLI flag | Config key | Default |
 |--------|----------|------------|---------|
 | Province | `-p`, `--province` | `province` | `Ontario` |
 | Annual salary | `-s`, `--salary` | `annualSalary` | _(prompted)_ |
-| Tax year | `-y`, `--year` | `year` | current year |
 | Pay period | `--pay-period` | `payPeriod` | `Semi-monthly (24)` |
 | Employee RRSP % | `--rrsp-employee` | `rrspEmployeePercent` | `4` |
 | Employer RRSP % | `--rrsp-employer` | `rrspEmployerPercent` | `4` |
@@ -82,20 +114,69 @@ CLI args override config file values. Missing values are prompted interactively.
 | Annual totals | `-a`, `--annual` | — | `false` |
 | Monthly averages | `-m`, `--monthly` | — | `false` |
 | Verbose | `-v`, `--verbose` | — | `false` |
+| Self-update | `--update` | — | — |
+| Show version | `--version` | — | — |
 | Headless | `--headless` | — | `false` |
 | Config path | `-c`, `--config` | — | — |
 
+### 2026 CPP/EI Maximums (used for `--table`)
+
+| | Amount |
+|---|---|
+| CPP max contribution | $4,230.45 |
+| CPP2 max (additional) | $416.00 |
+| EI max premium | $1,123.07 |
+
+## Run from source
+
+If you'd rather not download a binary, you can clone and run directly. You'll need [Google Chrome](https://www.google.com/chrome/) installed.
+
+### With Bun
+
+```bash
+git clone https://github.com/SeeThruHead/cra-payroll.git
+cd cra-payroll
+bun install
+bun run dev -- --salary 100000
+bun run dev -- --salary 150000 --table
+```
+
+### With Node
+
+```bash
+git clone https://github.com/SeeThruHead/cra-payroll.git
+cd cra-payroll
+npm install
+npx tsx src/cli.ts --salary 100000
+npx tsx src/cli.ts --salary 150000 --table
+```
+
+## Development
+
+```bash
+# Run directly
+bun run dev -- --salary 100000
+
+# Build standalone binary
+bun run build
+
+# Unit tests (fast, no browser)
+bun test
+
+# Integration tests (hits CRA, needs Chrome, may be flaky)
+bun run test:integration
+
+# All tests
+bun run test:all
+```
+
 ## How it works
 
 1. Launches your system Chrome via Puppeteer (headed by default — CRA blocks headless)
 2. Fills out the PDOC wizard: province, pay period, salary, RRSP contributions
 3. Sets CPP/EI status and hits Calculate
 4. Scrapes the results page for taxes, deductions, and net pay
-5. For `--table` mode: runs twice (with/without CPP/EI) and simulates each paycheck using the annual maximums
-
-## Standalone binary
-
-If you prefer a standalone binary without Node.js, see the [GitHub releases](https://github.com/SeeThruHead/cra-payroll/releases).
+5. For `--table` mode: runs twice (with/without CPP/EI) and simulates each paycheck using the 2026 maximums
 
 ## License
 

package/dist/cra-payroll.js

@@ -69212,8 +69212,8 @@ var init_LaunchOptions = __esm(() => {
 
 // src/cli.ts
 import { parseArgs } from "util";
-import { resolve as resolve7 } from "path";
-import { existsSync as existsSync5, readFileSync as readFileSync5, fstatSync } from "fs";
+import { resolve as resolve8 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync6, fstatSync } from "fs";
 import { createInterface as createInterface2 } from "readline";
 
 // node_modules/neverthrow/dist/index.cjs.js
@@ -79630,7 +79630,7 @@ import { existsSync as existsSync4, renameSync, unlinkSync, chmodSync } from "fs
 // package.json
 var package_default = {
   name: "@seethruhead/cra-payroll",
-  version: "0.7.0",
+  version: "0.8.0",
   description: "Calculate Canadian payroll deductions using CRA's Payroll Deductions Online Calculator",
   type: "module",
   bin: {
@@ -80171,6 +80171,241 @@ var buildJsonOutput = (mode, config2, data) => {
   }
 };
 
+// src/rrsp-optimizer.ts
+import { resolve as resolve7 } from "path";
+import { existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync5, writeFileSync as writeFileSync2 } from "fs";
+import { createHash as createHash2 } from "crypto";
+var PROVINCE_CODES = {
+  Alberta: "ab",
+  "British Columbia": "bc",
+  Manitoba: "mb",
+  "New Brunswick": "nb",
+  "Newfoundland and Labrador": "nl",
+  Newfoundland: "nl",
+  "Nova Scotia": "ns",
+  Ontario: "on",
+  "Prince Edward Island": "pe",
+  Quebec: "qc",
+  Saskatchewan: "sk",
+  "Northwest Territories": "nt",
+  Nunavut: "nu",
+  Yukon: "yt"
+};
+var resolveProvinceCode = (province) => {
+  if (Object.values(PROVINCE_CODES).includes(province.toLowerCase()))
+    return $ok(province.toLowerCase());
+  const code = PROVINCE_CODES[province];
+  if (code)
+    return $ok(code);
+  return $err(`Unknown province "${province}". Supported: ${Object.keys(PROVINCE_CODES).join(", ")}`);
+};
+var RRSP_URL = "https://www.rrspcontribution.ca/submit";
+var buildFormBody = (config2, provinceCode) => {
+  const params = new URLSearchParams;
+  params.set("year", String(config2.year));
+  params.set("province", provinceCode);
+  params.set("income", String(config2.income));
+  params.set("rrsp_room", String(config2.rrspRoom));
+  params.set("num_kids_5_and_younger", String(config2.numKids5AndYounger));
+  params.set("num_kids_6_and_older", String(config2.numKids6AndOlder));
+  if (config2.hasSpouse)
+    params.set("spouse", "y");
+  if (config2.spouseIncome !== null)
+    params.set("spouse_income", String(config2.spouseIncome));
+  return params.toString();
+};
+var fetchResults = async (config2) => {
+  const provinceCode = resolveProvinceCode(config2.province);
+  if (provinceCode.isErr())
+    return $err(provinceCode.error);
+  const body = buildFormBody(config2, provinceCode.value);
+  log(`RRSP optimizer POST: ${body}`);
+  try {
+    const response = await fetch(RRSP_URL, {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body
+    });
+    if (!response.ok)
+      return $err(`HTTP ${response.status}: ${response.statusText}`);
+    return $ok(await response.text());
+  } catch (e2) {
+    return $err(`Network error: ${e2.message}`);
+  }
+};
+var parseRecommendation = (html) => {
+  const contMatch = html.match(/contribute\s+\$\s*([\d,]+)/i);
+  const savMatch = html.match(/savings\s+of\s+\$\s*([\d,]+)/i);
+  const pctMatch = html.match(/([\d.]+)\s*%\s*<\/b>\s*of your contribution/i);
+  if (!contMatch)
+    return $err("Could not parse recommended contribution from response");
+  if (!savMatch)
+    return $err("Could not parse savings amount from response");
+  const contribution = parseFloat(contMatch[1].replace(/,/g, ""));
+  const savings = parseFloat(savMatch[1].replace(/,/g, ""));
+  const savingsPercent = pctMatch ? parseFloat(pctMatch[1]) / 100 : savings / contribution;
+  return $ok({ contribution, savings, savingsPercent });
+};
+var parseStepsTable = (html) => {
+  const steps = [];
+  const rowRegex = /<tr>\s*(?:<td>\s*(.*?)\s*<\/td>\s*){6}<\/tr>/gs;
+  const tableMatch = html.match(/<table class="table table-striped">([\s\S]*?)<\/table>/);
+  if (!tableMatch)
+    return steps;
+  const tableHtml = tableMatch[1];
+  const rows = tableHtml.split(/<tr>/g).slice(2);
+  for (const row of rows) {
+    const cells = [...row.matchAll(/<td>([\s\S]*?)<\/td>/g)].map((m) => m[1].trim());
+    if (cells.length < 6)
+      continue;
+    steps.push({
+      step: parseInt(cells[0], 10),
+      stepSize: parseFloat(cells[1].replace(/[$,]/g, "")),
+      cumulativeContribution: parseFloat(cells[2].replace(/[$,]/g, "")),
+      effectiveTaxRate: parseFloat(cells[3].replace(/%/, "")) / 100,
+      cumulativeSavings: parseFloat(cells[4].replace(/[$,]/g, "")),
+      event: cells[5].replace(/=&gt;/g, "→").replace(/<[^>]*>/g, "").trim()
+    });
+  }
+  return steps;
+};
+var parseBenefits = (html) => {
+  const section = html.match(/government benefits and tax credits are included:[\s\S]*?<ul[^>]*>([\s\S]*?)<\/ul>/);
+  if (!section)
+    return [];
+  return [...section[1].matchAll(/<li[^>]*>([\s\S]*?)<\/li>/g)].map((m) => m[1].trim()).filter(Boolean);
+};
+var parseHtml = (html) => {
+  const rec = parseRecommendation(html);
+  if (rec.isErr())
+    return $err(rec.error);
+  const steps = parseStepsTable(html);
+  const benefits = parseBenefits(html);
+  return $ok({
+    recommendedContribution: rec.value.contribution,
+    totalSavings: rec.value.savings,
+    savingsPercent: rec.value.savingsPercent,
+    steps,
+    benefitsIncluded: benefits
+  });
+};
+var CACHE_DIR = resolve7(process.env.HOME || "~", ".config", "cra-payroll", "cache", "rrsp");
+var cacheKey2 = (config2) => {
+  const data = JSON.stringify({
+    year: config2.year,
+    province: config2.province,
+    income: config2.income,
+    rrspRoom: config2.rrspRoom,
+    numKids5AndYounger: config2.numKids5AndYounger,
+    numKids6AndOlder: config2.numKids6AndOlder,
+    hasSpouse: config2.hasSpouse,
+    spouseIncome: config2.spouseIncome
+  });
+  return createHash2("sha256").update(data).digest("hex").slice(0, 16);
+};
+var cachePath2 = (config2) => resolve7(CACHE_DIR, `${cacheKey2(config2)}.json`);
+var readCache2 = (config2) => {
+  const path12 = cachePath2(config2);
+  if (!existsSync5(path12))
+    return null;
+  try {
+    const data = JSON.parse(readFileSync5(path12, "utf-8"));
+    if (typeof data.recommendedContribution === "number")
+      return data;
+    return null;
+  } catch {
+    return null;
+  }
+};
+var writeCache2 = (config2, result) => {
+  try {
+    if (!existsSync5(CACHE_DIR))
+      mkdirSync3(CACHE_DIR, { recursive: true });
+    writeFileSync2(cachePath2(config2), JSON.stringify(result, null, 2));
+  } catch (e2) {
+    log(`RRSP cache write failed: ${e2.message}`);
+  }
+};
+var rawOptimize = async (config2) => {
+  const html = await fetchResults(config2);
+  if (html.isErr())
+    return $err(html.error);
+  return parseHtml(html.value);
+};
+var cachedOptimize = async (config2) => {
+  const cached = readCache2(config2);
+  if (cached) {
+    log(`RRSP cache hit: ${cachePath2(config2)}`);
+    return $ok(cached);
+  }
+  log("RRSP cache miss, hitting rrspcontribution.ca...");
+  const result = await rawOptimize(config2);
+  if (result.isOk())
+    writeCache2(config2, result.value);
+  return result;
+};
+var rrspOptimizerService = { optimize: cachedOptimize };
+var rrspOptimizerServiceNoCache = { optimize: rawOptimize };
+
+// src/views/rrsp.ts
+var f2 = (n5) => money(n5).padStart(10);
+var W3 = 80;
+var renderRrspAdvice = (config2, result) => {
+  const parts = [];
+  parts.push("");
+  parts.push(`RRSP Contribution Optimizer  (via rrspcontribution.ca)`);
+  parts.push(line("─", W3));
+  parts.push(`Province:      ${config2.province}`);
+  parts.push(`Year:          ${config2.year}`);
+  parts.push(`Income:        $${money(config2.income)}`);
+  parts.push(`RRSP Room:     $${money(config2.rrspRoom)}`);
+  if (config2.numKids5AndYounger > 0)
+    parts.push(`Kids ≤5:       ${config2.numKids5AndYounger}`);
+  if (config2.numKids6AndOlder > 0)
+    parts.push(`Kids 6–17:     ${config2.numKids6AndOlder}`);
+  if (config2.hasSpouse)
+    parts.push(`Spouse Income: ${config2.spouseIncome !== null ? `$${money(config2.spouseIncome)}` : "N/A"}`);
+  parts.push(line("─", W3));
+  parts.push("");
+  parts.push(`\uD83D\uDCA1 Recommendation`);
+  parts.push(line("═", W3));
+  parts.push(`  Contribute:   $${f2(result.recommendedContribution)}`);
+  parts.push(`  Tax Savings:  $${f2(result.totalSavings)}  (${pct(result.savingsPercent * 100)} of contribution)`);
+  parts.push(line("═", W3));
+  if (result.steps.length > 0) {
+    parts.push("");
+    parts.push(`Marginal Effective Tax Rate Breakdown`);
+    parts.push(line("─", W3));
+    const hStep = "Step".padStart(4);
+    const hSize = "Step Size".padStart(12);
+    const hCum = "Cumulative".padStart(12);
+    const hRate = "METR".padStart(7);
+    const hSav = "Savings".padStart(12);
+    const hEvt = "Event";
+    parts.push(`${hStep}  ${hSize}  ${hCum}  ${hRate}  ${hSav}  ${hEvt}`);
+    parts.push(line("─", W3));
+    for (const s of result.steps) {
+      const step = String(s.step).padStart(4);
+      const size = `$${money(s.stepSize)}`.padStart(12);
+      const cum = `$${money(s.cumulativeContribution)}`.padStart(12);
+      const rate = pct(s.effectiveTaxRate * 100).padStart(7);
+      const sav = `$${money(s.cumulativeSavings)}`.padStart(12);
+      parts.push(`${step}  ${size}  ${cum}  ${rate}  ${sav}  ${s.event}`);
+    }
+    parts.push(line("─", W3));
+  }
+  if (result.benefitsIncluded.length > 0) {
+    parts.push("");
+    parts.push("Includes impact of:");
+    for (const b of result.benefitsIncluded) {
+      parts.push(`  • ${b}`);
+    }
+  }
+  parts.push("");
+  return parts.join(`
+`);
+};
+
 // src/cli.ts
 var PROVINCES = [
   "Alberta",
@@ -80219,6 +80454,11 @@ try {
       monthly: { type: "boolean", short: "m", default: false },
       json: { type: "boolean", default: false },
       "no-cache": { type: "boolean", default: false },
+      "rrsp-room": { type: "string" },
+      "num-kids-young": { type: "string" },
+      "num-kids-older": { type: "string" },
+      spouse: { type: "boolean", default: false },
+      "spouse-income": { type: "string" },
       update: { type: "boolean", default: false },
       version: { type: "boolean", default: false },
       headless: { type: "boolean", default: false },
@@ -80263,7 +80503,12 @@ if (values.help) {
     -a, --annual              Show annualized totals
     -m, --monthly             Show monthly averages
     --json                    Output results as JSON (works with -t, -M, -a, -m, or single)
-    --no-cache                Skip cache and force a fresh CRA lookup
+    --no-cache                Skip cache and force a fresh lookup
+    --rrsp-room <amount>      RRSP contribution room (enables RRSP advice automatically)
+    --num-kids-young <n>      Number of kids 5 and younger (for RRSP advice, default: 0)
+    --num-kids-older <n>      Number of kids 6–17 (for RRSP advice, default: 0)
+    --spouse                  Have a spouse (for RRSP advice)
+    --spouse-income <amount>  Spouse's income (for RRSP advice)
     --headless                Run browser headless (may be blocked by CRA)
     --update                  Self-update to the latest release
     --version                 Show current version
@@ -80279,7 +80524,8 @@ if (values.help) {
       "rrspMatchPercent": 4,
       "rrspUnmatchedPercent": 0,
       "cppMaxedOut": false,
-      "eiMaxedOut": false
+      "eiMaxedOut": false,
+      "rrspRoom": 50000
     }
 
   You can pipe a config file via stdin, pass one with --config, or place
@@ -80358,14 +80604,14 @@ var readStdinConfig = async () => {
 };
 var readFileConfig = (configFlag) => {
   const configPaths = [
-    configFlag ? resolve7(configFlag) : "",
-    resolve7("config.json"),
-    resolve7(process.env.HOME || "~", ".config", "cra-payroll.json"),
-    resolve7(process.env.HOME || "~", ".cra-payroll.json")
+    configFlag ? resolve8(configFlag) : "",
+    resolve8("config.json"),
+    resolve8(process.env.HOME || "~", ".config", "cra-payroll.json"),
+    resolve8(process.env.HOME || "~", ".cra-payroll.json")
   ].filter(Boolean);
   for (const p of configPaths) {
-    if (p && existsSync5(p)) {
-      return JSON.parse(readFileSync5(p, "utf-8"));
+    if (p && existsSync6(p)) {
+      return JSON.parse(readFileSync6(p, "utf-8"));
     }
   }
   return {};
@@ -80381,57 +80627,83 @@ var loadFileConfig = async (configFlag, isPiped) => {
   try {
     const config2 = readFileConfig(configFlag);
     if (configFlag && Object.keys(config2).length === 0) {
-      return $err(`Config file not found: ${resolve7(configFlag)}`);
+      return $err(`Config file not found: ${resolve8(configFlag)}`);
     }
     return $ok(config2);
   } catch (e2) {
     return $err(`Failed to parse config file: ${e2.message}`);
   }
 };
-var resolveField = async (label, cliVal, fileVal, defaultVal, promptFn, isPiped) => {
-  if (cliVal !== undefined)
-    return $ok(cliVal);
-  if (fileVal !== undefined)
-    return $ok(fileVal);
-  if (promptFn && !isPiped)
-    return $ok(await promptFn());
-  if (defaultVal !== undefined)
-    return $ok(defaultVal);
-  return $err(`${label} is required (pass via config or --${label})`);
+var DEFAULTS = {
+  province: "Ontario",
+  annualSalary: 0,
+  payPeriod: "Semi-monthly (24 pay periods a year)",
+  year: new Date().getFullYear(),
+  rrspMatchPercent: 4,
+  rrspUnmatchedPercent: 0,
+  cppMaxedOut: false,
+  eiMaxedOut: false
+};
+var cliToConfig = (vals) => {
+  const cfg = {};
+  if (vals.province !== undefined)
+    cfg.province = vals.province;
+  if (vals.salary !== undefined)
+    cfg.annualSalary = parseFloat(vals.salary);
+  if (vals["pay-period"] !== undefined)
+    cfg.payPeriod = vals["pay-period"];
+  if (vals.year !== undefined)
+    cfg.year = parseInt(vals.year, 10);
+  if (vals["rrsp-match"] !== undefined)
+    cfg.rrspMatchPercent = parseFloat(vals["rrsp-match"]);
+  if (vals["rrsp-unmatched"] !== undefined)
+    cfg.rrspUnmatchedPercent = parseFloat(vals["rrsp-unmatched"]);
+  if (vals["cpp-maxed"])
+    cfg.cppMaxedOut = true;
+  if (vals["ei-maxed"])
+    cfg.eiMaxedOut = true;
+  if (vals["rrsp-room"] !== undefined)
+    cfg.rrspRoom = parseFloat(vals["rrsp-room"]);
+  if (vals["num-kids-young"] !== undefined)
+    cfg.numKids5AndYounger = parseInt(vals["num-kids-young"], 10);
+  if (vals["num-kids-older"] !== undefined)
+    cfg.numKids6AndOlder = parseInt(vals["num-kids-older"], 10);
+  if (vals.spouse)
+    cfg.hasSpouse = true;
+  if (vals["spouse-income"] !== undefined)
+    cfg.spouseIncome = parseFloat(vals["spouse-income"]);
+  return cfg;
+};
+var promptMissing = async (merged, isPiped) => {
+  let { province, annualSalary, payPeriod, year } = merged;
+  if (!province && !isPiped) {
+    province = await promptChoice("Province of employment:", PROVINCES, "Ontario");
+  }
+  if (!province)
+    return $err("province is required (pass via config or --province)");
+  if (!annualSalary && !isPiped) {
+    annualSalary = await promptNumber("Annual salary ($)");
+  }
+  if (!annualSalary)
+    return $err("salary is required (pass via config or --salary)");
+  if (!payPeriod && !isPiped) {
+    payPeriod = await promptChoice("Pay period:", PAY_PERIODS2, "Semi-monthly (24 pay periods a year)");
+  }
+  if (!payPeriod)
+    return $err("pay-period is required (pass via config or --pay-period)");
+  if (!year && !isPiped) {
+    year = await promptNumber("Tax year", new Date().getFullYear());
+  }
+  if (!year)
+    return $err("year is required (pass via config or --year)");
+  return $ok({ ...merged, province, annualSalary, payPeriod, year });
 };
 var resolveConfig = async (vals, fileConfig, isPiped) => {
-  const province = await resolveField("province", vals.province, fileConfig.province, "Ontario", () => promptChoice("Province of employment:", PROVINCES, "Ontario"), isPiped);
-  if (province.isErr())
-    return $err(province.error);
-  const year = await resolveField("year", vals.year !== undefined ? parseInt(vals.year, 10) : undefined, fileConfig.year, new Date().getFullYear(), () => promptNumber("Tax year", new Date().getFullYear()), isPiped);
-  if (year.isErr())
-    return $err(year.error);
-  const salary = await resolveField("salary", vals.salary !== undefined ? parseFloat(vals.salary) : undefined, fileConfig.annualSalary, undefined, () => promptNumber("Annual salary ($)"), isPiped);
-  if (salary.isErr())
-    return $err(salary.error);
-  const payPeriod = await resolveField("pay-period", vals["pay-period"], fileConfig.payPeriod, "Semi-monthly (24 pay periods a year)", () => promptChoice("Pay period:", PAY_PERIODS2, "Semi-monthly (24 pay periods a year)"), isPiped);
-  if (payPeriod.isErr())
-    return $err(payPeriod.error);
-  const rrspMatch = await resolveField("rrsp-match", vals["rrsp-match"] !== undefined ? parseFloat(vals["rrsp-match"]) : undefined, fileConfig.rrspMatchPercent, 4, () => promptNumber("RRSP match % (employee + employer both contribute)", 4), isPiped);
-  if (rrspMatch.isErr())
-    return $err(rrspMatch.error);
-  const rrspUnmatched = await resolveField("rrsp-unmatched", vals["rrsp-unmatched"] !== undefined ? parseFloat(vals["rrsp-unmatched"]) : undefined, fileConfig.rrspUnmatchedPercent, 0, () => promptNumber("Additional unmatched employee RRSP %", 0), isPiped);
-  if (rrspUnmatched.isErr())
-    return $err(rrspUnmatched.error);
-  const cppMaxedOut = vals["cpp-maxed"] === true ? true : fileConfig.cppMaxedOut ?? false;
-  const eiMaxedOut = vals["ei-maxed"] === true ? true : fileConfig.eiMaxedOut ?? false;
-  return $ok({
-    province: province.value,
-    annualSalary: salary.value,
-    payPeriod: payPeriod.value,
-    year: year.value,
-    rrspMatchPercent: rrspMatch.value,
-    rrspUnmatchedPercent: rrspUnmatched.value,
-    cppMaxedOut,
-    eiMaxedOut
-  });
+  const cliConfig = cliToConfig(vals);
+  const merged = { ...DEFAULTS, ...fileConfig, ...cliConfig };
+  return promptMissing(merged, isPiped);
 };
-var runYearlyMode = async (config2, headless, svc, flags) => {
+var runYearlyMode = async (config2, headless, svc, flags, rrspAdvice) => {
   const yearlyResult = await calculateYearly(svc, config2, headless);
   if (yearlyResult.isErr()) {
     console.error(`Error: ${yearlyResult.error}`);
@@ -80443,7 +80715,10 @@ var runYearlyMode = async (config2, headless, svc, flags) => {
   if (flags.json) {
     const monthlyData = flags.monthTable ? groupByMonth(yearly, config2.year, config2.payPeriod, periodsPerYear) : undefined;
     const mode = flags.monthTable ? "month-table" : flags.table ? "table" : flags.annual ? "annual" : "monthly";
-    console.log(JSON.stringify(buildJsonOutput(mode, config2, { yearly, monthly: monthlyData }), null, 2));
+    const output2 = buildJsonOutput(mode, config2, { yearly, monthly: monthlyData });
+    if (rrspAdvice)
+      output2.rrspAdvice = rrspAdvice.result;
+    console.log(JSON.stringify(output2, null, 2));
     return;
   }
   if (flags.table)
@@ -80456,18 +80731,46 @@ var runYearlyMode = async (config2, headless, svc, flags) => {
     console.log(renderAnnual(yearly.totals));
   if (flags.monthly)
     console.log(renderMonthly(yearly.totals));
+  if (rrspAdvice)
+    console.log(renderRrspAdvice(rrspAdvice.config, rrspAdvice.result));
 };
-var runSingleMode = async (config2, headless, svc, json) => {
+var runSingleMode = async (config2, headless, svc, json, rrspAdvice) => {
   const calcResult = await svc.calculate(config2, headless);
   if (calcResult.isErr()) {
     console.error(`Error: ${calcResult.error}`);
     process.exit(1);
   }
   if (json) {
-    console.log(JSON.stringify(buildJsonOutput("single", config2, { single: calcResult.value }), null, 2));
+    const output2 = buildJsonOutput("single", config2, { single: calcResult.value });
+    if (rrspAdvice)
+      output2.rrspAdvice = rrspAdvice.result;
+    console.log(JSON.stringify(output2, null, 2));
     return;
   }
   console.log(renderSingleResult(calcResult.value));
+  if (rrspAdvice)
+    console.log(renderRrspAdvice(rrspAdvice.config, rrspAdvice.result));
+};
+var fetchRrspAdvice = async (config2, noCache) => {
+  if (!config2.rrspRoom || config2.rrspRoom <= 0)
+    return null;
+  const rrspSvc = noCache ? rrspOptimizerServiceNoCache : rrspOptimizerService;
+  const rrspConfig = {
+    year: config2.year,
+    province: config2.province,
+    income: config2.annualSalary,
+    rrspRoom: config2.rrspRoom,
+    numKids5AndYounger: config2.numKids5AndYounger ?? 0,
+    numKids6AndOlder: config2.numKids6AndOlder ?? 0,
+    hasSpouse: config2.hasSpouse ?? false,
+    spouseIncome: config2.spouseIncome ?? null
+  };
+  const result = await rrspSvc.optimize(rrspConfig);
+  if (result.isErr()) {
+    console.error(`⚠️  RRSP advice unavailable: ${result.error}`);
+    return null;
+  }
+  return { config: rrspConfig, result: result.value };
 };
 var showUpdateNag = async () => {
   if (!isCompiledBinary)
@@ -80504,10 +80807,13 @@ var wantJson = values.json ?? false;
 if (!wantJson) {
   console.log(renderConfig(config2, !wantTable && !wantMonthTable && !wantAnnual && !wantMonthly));
 }
+var rrspAdvicePromise = config2.rrspRoom ? (!wantJson && console.error("Fetching RRSP advice from rrspcontribution.ca..."), fetchRrspAdvice(config2, values["no-cache"] ?? false)) : Promise.resolve(null);
 if (wantTable || wantMonthTable || wantAnnual || wantMonthly) {
-  await runYearlyMode(config2, headless, service, { table: wantTable, monthTable: wantMonthTable, annual: wantAnnual, monthly: wantMonthly, json: wantJson });
+  const rrspAdvice = await rrspAdvicePromise;
+  await runYearlyMode(config2, headless, service, { table: wantTable, monthTable: wantMonthTable, annual: wantAnnual, monthly: wantMonthly, json: wantJson }, rrspAdvice);
 } else {
-  await runSingleMode(config2, headless, service, wantJson);
+  const rrspAdvice = await rrspAdvicePromise;
+  await runSingleMode(config2, headless, service, wantJson, rrspAdvice);
 }
 if (!wantJson)
   await showUpdateNag();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seethruhead/cra-payroll",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Calculate Canadian payroll deductions using CRA's Payroll Deductions Online Calculator",
   "type": "module",
   "bin": {

package/README.md.bak

@@ -1,183 +0,0 @@
-# cra-payroll
-
-Calculate Canadian payroll deductions using CRA's [Payroll Deductions Online Calculator (PDOC)](https://apps.cra-arc.gc.ca/ebci/rhpd/beta/entry).
-
-Automates the CRA wizard via Playwright and returns your net pay, taxes, CPP, EI, and RRSP breakdown — per paycheck, monthly, or annually.
-
-## Download
-
-Grab the latest binary for your platform from [**Releases**](https://github.com/SeeThruHead/cra-payroll/releases):
-
-| Platform | File |
-|----------|------|
-| macOS (Apple Silicon) | `cra-payroll-darwin-arm64` |
-| macOS (Intel) | `cra-payroll-darwin-x64` |
-| Linux (x64) | `cra-payroll-linux-x64` |
-
-```bash
-# Example: macOS Apple Silicon
-curl -L -o cra-payroll https://github.com/SeeThruHead/cra-payroll/releases/latest/download/cra-payroll-darwin-arm64
-chmod +x cra-payroll
-
-# Remove macOS quarantine flag (unsigned binary)
-xattr -d com.apple.quarantine cra-payroll
-
-sudo mv cra-payroll /usr/local/bin/
-```
-
-> **Requires Google Chrome** — uses your system Chrome, no extra browser install needed.
-
-Or use the one-liner:
-
-```bash
-curl -fsSL https://raw.githubusercontent.com/SeeThruHead/cra-payroll/main/install.sh | bash
-```
-
-## Usage
-
-```bash
-# Interactive — prompts for missing values
-cra-payroll
-
-# CLI args
-cra-payroll --salary 120000 --province "British Columbia"
-
-# Per-paycheck table for the year (tracks CPP/EI maxout)
-cra-payroll --salary 263000 --table
-
-# Annual totals
-cra-payroll --salary 100000 --annual
-
-# Monthly averages
-cra-payroll --salary 100000 --monthly
-
-# Combine them
-cra-payroll --salary 263000 --table --annual --monthly
-
-# Verbose logging
-cra-payroll -v --salary 100000
-
-# Check version
-cra-payroll --version
-
-# Self-update to latest release
-cra-payroll --update
-```
-
-### Example output (`--table`)
-
-```
-📊 Per-Paycheck Table (2026)
-══════════════════════════════════════════════════════════════════════════════════════════════
-  #  │     Gross │   Fed Tax │  Prov Tax │       CPP │        EI │   Net Pay │ Cum CPP/EI
-──────────────────────────────────────────────────────────────────────────────────────────────
-  1  │ 10,958.33 │  2,232.82 │  1,431.13 │    669.42 │    178.62 │  6,446.34 │    848.04
-  2  │ 10,958.33 │  2,232.82 │  1,431.13 │    669.42 │    178.62 │  6,446.34 │  1,696.08
- ... │       ... │       ... │       ... │       ... │       ... │       ... │       ...
-  7  │ 10,958.33 │  2,232.82 │  1,431.13 │    213.93 │     51.35 │  7,029.10 │  5,353.52 ← partial
-  8  │ 10,958.33 │  2,232.82 │  1,431.13 │      0.00 │      0.00 │  7,294.38 │  5,353.52 ✓ maxed
- ... │       ... │       ... │       ... │       ... │       ... │       ... │       ...
-```
-
-## Config
-
-Config is loaded from the first file found:
-1. `--config <path>`
-2. `./config.json`
-3. `~/.config/cra-payroll.json`
-4. `~/.cra-payroll.json`
-
-CLI args override config file values. Missing values are prompted interactively.
-
-```json
-{
-  "province": "Ontario",
-  "annualSalary": 100000,
-  "payPeriod": "Semi-monthly (24 pay periods a year)",
-  "rrspEmployeePercent": 4,
-  "rrspEmployerPercent": 4
-}
-```
-
-### Options
-
-| Option | CLI flag | Config key | Default |
-|--------|----------|------------|---------|
-| Province | `-p`, `--province` | `province` | `Ontario` |
-| Annual salary | `-s`, `--salary` | `annualSalary` | _(prompted)_ |
-| Pay period | `--pay-period` | `payPeriod` | `Semi-monthly (24)` |
-| Employee RRSP % | `--rrsp-employee` | `rrspEmployeePercent` | `4` |
-| Employer RRSP % | `--rrsp-employer` | `rrspEmployerPercent` | `4` |
-| CPP maxed | `--cpp-maxed` | `cppMaxedOut` | `false` |
-| EI maxed | `--ei-maxed` | `eiMaxedOut` | `false` |
-| Yearly table | `-t`, `--table` | — | `false` |
-| Annual totals | `-a`, `--annual` | — | `false` |
-| Monthly averages | `-m`, `--monthly` | — | `false` |
-| Verbose | `-v`, `--verbose` | — | `false` |
-| Self-update | `--update` | — | — |
-| Show version | `--version` | — | — |
-| Headless | `--headless` | — | `false` |
-| Config path | `-c`, `--config` | — | — |
-
-### 2026 CPP/EI Maximums (used for `--table`)
-
-| | Amount |
-|---|---|
-| CPP max contribution | $4,230.45 |
-| CPP2 max (additional) | $416.00 |
-| EI max premium | $1,123.07 |
-
-## Run from source
-
-If you'd rather not download a binary, you can clone and run directly. You'll need [Google Chrome](https://www.google.com/chrome/) installed.
-
-### With Bun
-
-```bash
-git clone https://github.com/SeeThruHead/cra-payroll.git
-cd cra-payroll
-bun install
-bun run dev -- --salary 100000
-bun run dev -- --salary 263000 --table
-```
-
-### With Node
-
-```bash
-git clone https://github.com/SeeThruHead/cra-payroll.git
-cd cra-payroll
-npm install
-npx tsx src/cli.ts --salary 100000
-npx tsx src/cli.ts --salary 263000 --table
-```
-
-## Development
-
-```bash
-# Run directly
-bun run dev -- --salary 100000
-
-# Build standalone binary
-bun run build
-
-# Unit tests (fast, no browser)
-bun test
-
-# Integration tests (hits CRA, needs Chrome, may be flaky)
-bun run test:integration
-
-# All tests
-bun run test:all
-```
-
-## How it works
-
-1. Launches your system Chrome via Puppeteer (headed by default — CRA blocks headless)
-2. Fills out the PDOC wizard: province, pay period, salary, RRSP contributions
-3. Sets CPP/EI status and hits Calculate
-4. Scrapes the results page for taxes, deductions, and net pay
-5. For `--table` mode: runs twice (with/without CPP/EI) and simulates each paycheck using the 2026 maximums
-
-## License
-
-MIT