@dizzlkheinz/ynab-mcpb 0.17.0 → 0.17.1

package/.code/agents/5346/exec-call_B2el3B79rVkq9LhWTI2VYlz7.txt

@@ -1,2456 +0,0 @@
-diff --git a/manifest.json b/manifest.json
-index b1dd09f..a71a3b2 100644
---- a/manifest.json
-+++ b/manifest.json
-@@ -1,7 +1,7 @@
- {
-   "manifest_version": "0.3",
-   "name": "ynab-mcp-server",
--  "version": "0.13.0",
-+  "version": "0.13.4",
-   "description": "Model Context Protocol server for YNAB (You Need A Budget) integration. Provides 30 tools for comprehensive budget management, including delta-optimized data fetching, bulk transaction operations, advanced reconciliation with recommendations, split transaction support, and diagnostic utilities.",
-   "author": {
-     "name": "kdizzl"
-diff --git a/package-lock.json b/package-lock.json
-index ae9d883..f005622 100644
---- a/package-lock.json
-+++ b/package-lock.json
-@@ -1,19 +1,23 @@
- {
-   "name": "@dizzlkheinz/ynab-mcpb",
--  "version": "0.13.0",
-+  "version": "0.13.4",
-   "lockfileVersion": 3,
-   "requires": true,
-   "packages": {
-     "": {
-       "name": "@dizzlkheinz/ynab-mcpb",
--      "version": "0.13.0",
-+      "version": "0.13.4",
-       "license": "AGPL-3.0",
-       "dependencies": {
-         "@modelcontextprotocol/sdk": "^1.22.0",
-+        "chrono-node": "^2.9.0",
-         "csv-parse": "^6.1.0",
-         "d3-array": "^3.2.4",
-         "date-fns": "^4.1.0",
-+        "dayjs": "^1.11.19",
-         "dotenv": "^17.2.1",
-+        "fuzzball": "^2.2.3",
-+        "papaparse": "^5.5.3",
-         "ynab": "^2.9.0",
-         "zod": "^4.1.11",
-         "zod-validation-error": "^5.0.0"
-@@ -25,6 +29,7 @@
-         "@eslint/js": "^9.35.0",
-         "@types/d3-array": "^3.2.1",
-         "@types/node": "^24.5.2",
-+        "@types/papaparse": "^5.5.0",
-         "@vitest/coverage-v8": "^3.2.4",
-         "@vitest/ui": "^3.2.4",
-         "esbuild": "^0.25.10",
-@@ -1366,6 +1371,16 @@
-         "undici-types": "~7.12.0"
-       }
-     },
-+    "node_modules/@types/papaparse": {
-+      "version": "5.5.0",
-+      "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.5.0.tgz",
-+      "integrity": "sha512-GVs5iMQmUr54BAZYYkByv8zPofFxmyxUpISPb2oh8sayR3+1zbxasrOvoKiHJ/nnoq/uULuPsu1Lze1EkagVFg==",
-+      "dev": true,
-+      "license": "MIT",
-+      "dependencies": {
-+        "@types/node": "*"
-+      }
-+    },
-     "node_modules/@typescript-eslint/eslint-plugin": {
-       "version": "8.44.1",
-       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.44.1.tgz",
-@@ -2087,6 +2102,15 @@
-         "node": ">= 16"
-       }
-     },
-+    "node_modules/chrono-node": {
-+      "version": "2.9.0",
-+      "resolved": "https://registry.npmjs.org/chrono-node/-/chrono-node-2.9.0.tgz",
-+      "integrity": "sha512-glI4YY2Jy6JII5l3d5FN6rcrIbKSQqKPhWsIRYPK2IK8Mm4Q1ZZFdYIaDqglUNf7gNwG+kWIzTn0omzzE0VkvQ==",
-+      "license": "MIT",
-+      "engines": {
-+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-+      }
-+    },
-     "node_modules/color-convert": {
-       "version": "2.0.1",
-       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-@@ -2208,6 +2232,12 @@
-         "url": "https://github.com/sponsors/kossnocorp"
-       }
-     },
-+    "node_modules/dayjs": {
-+      "version": "1.11.19",
-+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
-+      "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==",
-+      "license": "MIT"
-+    },
-     "node_modules/debug": {
-       "version": "4.4.1",
-       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-@@ -2974,6 +3004,17 @@
-         "url": "https://github.com/sponsors/ljharb"
-       }
-     },
-+    "node_modules/fuzzball": {
-+      "version": "2.2.3",
-+      "resolved": "https://registry.npmjs.org/fuzzball/-/fuzzball-2.2.3.tgz",
-+      "integrity": "sha512-sQDb3kjI7auA4YyE1YgEW85MTparcSgRgcCweUK06Cn0niY5lN+uhFiRUZKN4MQVGGiHxlbrYCA4nL1QjOXBLQ==",
-+      "license": "MIT",
-+      "dependencies": {
-+        "heap": ">=0.2.0",
-+        "lodash": "^4.17.21",
-+        "setimmediate": "^1.0.5"
-+      }
-+    },
-     "node_modules/get-intrinsic": {
-       "version": "1.3.0",
-       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-@@ -3124,6 +3165,12 @@
-         "node": ">= 0.4"
-       }
-     },
-+    "node_modules/heap": {
-+      "version": "0.2.7",
-+      "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz",
-+      "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==",
-+      "license": "MIT"
-+    },
-     "node_modules/html-escaper": {
-       "version": "2.0.2",
-       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-@@ -3426,6 +3473,12 @@
-         "url": "https://github.com/sponsors/sindresorhus"
-       }
-     },
-+    "node_modules/lodash": {
-+      "version": "4.17.21",
-+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-+      "license": "MIT"
-+    },
-     "node_modules/lodash.merge": {
-       "version": "4.6.2",
-       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-@@ -3756,6 +3809,12 @@
-       "dev": true,
-       "license": "BlueOak-1.0.0"
-     },
-+    "node_modules/papaparse": {
-+      "version": "5.5.3",
-+      "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.5.3.tgz",
-+      "integrity": "sha512-5QvjGxYVjxO59MGU2lHVYpRWBBtKHnlIAcSe1uNFCkkptUh63NFRj0FJQm7nR67puEruUci/ZkjmEFrjCAyP4A==",
-+      "license": "MIT"
-+    },
-     "node_modules/parent-module": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-@@ -4307,6 +4366,12 @@
-         "node": ">= 18"
-       }
-     },
-+    "node_modules/setimmediate": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-+      "license": "MIT"
-+    },
-     "node_modules/setprototypeof": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-diff --git a/package.json b/package.json
-index 3ae5a2e..1dad489 100644
---- a/package.json
-+++ b/package.json
-@@ -67,10 +67,14 @@
-   "license": "AGPL-3.0",
-   "dependencies": {
-     "@modelcontextprotocol/sdk": "^1.22.0",
-+    "chrono-node": "^2.9.0",
-     "csv-parse": "^6.1.0",
-     "d3-array": "^3.2.4",
-     "date-fns": "^4.1.0",
-+    "dayjs": "^1.11.19",
-     "dotenv": "^17.2.1",
-+    "fuzzball": "^2.2.3",
-+    "papaparse": "^5.5.3",
-     "ynab": "^2.9.0",
-     "zod": "^4.1.11",
-     "zod-validation-error": "^5.0.0"
-@@ -79,6 +83,7 @@
-     "@eslint/js": "^9.35.0",
-     "@types/d3-array": "^3.2.1",
-     "@types/node": "^24.5.2",
-+    "@types/papaparse": "^5.5.0",
-     "@vitest/coverage-v8": "^3.2.4",
-     "@vitest/ui": "^3.2.4",
-     "esbuild": "^0.25.10",
-diff --git a/src/tools/reconciliation/__tests__/analyzer.test.ts b/src/tools/reconciliation/__tests__/analyzer.test.ts
-index cc21d34..4467602 100644
---- a/src/tools/reconciliation/__tests__/analyzer.test.ts
-+++ b/src/tools/reconciliation/__tests__/analyzer.test.ts
-@@ -1,12 +1,11 @@
- import { describe, it, expect, vi, beforeEach } from 'vitest';
- import { analyzeReconciliation } from '../analyzer.js';
- import type { Transaction as YNABAPITransaction } from 'ynab';
--import * as parser from '../../compareTransactions/parser.js';
-+import * as csvParser from '../csvParser.js';
- 
- // Mock the parser module
--vi.mock('../../compareTransactions/parser.js', () => ({
--  parseBankCSV: vi.fn(),
--  readCSVFile: vi.fn(),
-+vi.mock('../csvParser.js', () => ({
-+  parseCSV: vi.fn(),
- }));
- 
- describe('analyzer', () => {
-@@ -17,26 +16,36 @@ describe('analyzer', () => {
-   describe('analyzeReconciliation', () => {
-     it('should perform full analysis and return structured results', () => {
-       // Mock CSV parsing
--      vi.mocked(parser.parseBankCSV).mockReturnValue({
-+      vi.mocked(csvParser.parseCSV).mockReturnValue({
-         transactions: [
-           {
-+            id: 'b1',
-             date: '2025-10-15',
--            amount: -45.23,
-+            amount: -45230, // milliunits
-             payee: 'Shell Gas',
-             memo: '',
-+            sourceRow: 1,
-+            raw: { date: '10/15/2025', amount: '-45.23', description: 'Shell Gas' },
-           },
-           {
-+            id: 'b2',
-             date: '2025-10-16',
--            amount: -100.0,
-+            amount: -100000, // milliunits
-             payee: 'Netflix',
-             memo: '',
-+            sourceRow: 2,
-+            raw: { date: '10/16/2025', amount: '-100.00', description: 'Netflix' },
-           },
-         ],
--        format_detected: 'standard',
--        delimiter: ',',
--        total_rows: 2,
--        valid_rows: 2,
-+        meta: {
-+          detectedDelimiter: ',',
-+          detectedColumns: ['Date', 'Amount', 'Description'],
-+          totalRows: 2,
-+          validRows: 2,
-+          skippedRows: 0,
-+        },
-         errors: [],
-+        warnings: [],
-       });
- 
-       const ynabTxns: YNABAPITransaction[] = [
-@@ -76,23 +85,33 @@ describe('analyzer', () => {
-       expect(result.unmatched_ynab).toBeDefined();
-       expect(result.balance_info).toBeDefined();
-       expect(result.next_steps).toBeDefined();
-+
-+      // Verify auto-matches (exact matches)
-+      expect(result.auto_matches.length).toBe(2);
-     });
- 
-     it('should categorize high-confidence matches as auto-matches', () => {
--      vi.mocked(parser.parseBankCSV).mockReturnValue({
-+      vi.mocked(csvParser.parseCSV).mockReturnValue({
-         transactions: [
-           {
-+            id: 'b1',
-             date: '2025-10-15',
--            amount: -50.0,
-+            amount: -50000,
-             payee: 'Coffee Shop',
-             memo: '',
-+            sourceRow: 1,
-+            raw: {} as any,
-           },
-         ],
--        format_detected: 'standard',
--        delimiter: ',',
--        total_rows: 1,
--        valid_rows: 1,
-+        meta: {
-+          detectedDelimiter: ',',
-+          detectedColumns: [],
-+          totalRows: 1,
-+          validRows: 1,
-+          skippedRows: 0,
-+        },
-         errors: [],
-+        warnings: [],
-       });
- 
-       const ynabTxns: YNABAPITransaction[] = [
-@@ -114,28 +133,35 @@ describe('analyzer', () => {
-     });
- 
-     it('should categorize medium-confidence matches as suggested', () => {
--      vi.mocked(parser.parseBankCSV).mockReturnValue({
-+      vi.mocked(csvParser.parseCSV).mockReturnValue({
-         transactions: [
-           {
-+            id: 'b1',
-             date: '2025-10-15',
--            amount: -50.0,
--            payee: 'Amazon',
-+            amount: -50000,
-+            payee: 'Generic Store',
-             memo: '',
-+            sourceRow: 1,
-+            raw: {} as any,
-           },
-         ],
--        format_detected: 'standard',
--        delimiter: ',',
--        total_rows: 1,
--        valid_rows: 1,
-+        meta: {
-+          detectedDelimiter: ',',
-+          detectedColumns: [],
-+          totalRows: 1,
-+          validRows: 1,
-+          skippedRows: 0,
-+        },
-         errors: [],
-+        warnings: [],
-       });
- 
-       const ynabTxns: YNABAPITransaction[] = [
-         {
-           id: 'y1',
--          date: '2025-10-18', // 3 days difference
-+          date: '2025-10-18', // 3 days difference - date score drops
-           amount: -50000,
--          payee_name: 'Amazon Prime',
-+          payee_name: 'Amazon Prime', // Fuzzy match
-           category_name: 'Shopping',
-           cleared: 'uncleared' as const,
-           approved: true,
-@@ -144,25 +170,33 @@ describe('analyzer', () => {
- 
-       const result = analyzeReconciliation('csv', undefined, ynabTxns, -50.0);
- 
--      // Might be medium or low depending on exact scoring
--      expect(result.suggested_matches.length + result.unmatched_bank.length).toBeGreaterThan(0);
-+      // Should be suggested (medium)
-+      expect(result.suggested_matches.length).toBeGreaterThan(0);
-+      expect(result.suggested_matches[0].confidence).toBe('medium');
-     });
- 
-     it('should identify unmatched bank transactions', () => {
--      vi.mocked(parser.parseBankCSV).mockReturnValue({
-+      vi.mocked(csvParser.parseCSV).mockReturnValue({
-         transactions: [
-           {
-+            id: 'b1',
-             date: '2025-10-15',
--            amount: -15.99,
-+            amount: -15990,
-             payee: 'New Store',
-             memo: '',
-+            sourceRow: 1,
-+            raw: {} as any,
-           },
-         ],
--        format_detected: 'standard',
--        delimiter: ',',
--        total_rows: 1,
--        valid_rows: 1,
-+        meta: {
-+          detectedDelimiter: ',',
-+          detectedColumns: [],
-+          totalRows: 1,
-+          validRows: 1,
-+          skippedRows: 0,
-+        },
-         errors: [],
-+        warnings: [],
-       });
- 
-       const ynabTxns: YNABAPITransaction[] = [];
-@@ -174,13 +208,17 @@ describe('analyzer', () => {
-     });
- 
-     it('should identify unmatched YNAB transactions', () => {
--      vi.mocked(parser.parseBankCSV).mockReturnValue({
-+      vi.mocked(csvParser.parseCSV).mockReturnValue({
-         transactions: [],
--        format_detected: 'standard',
--        delimiter: ',',
--        total_rows: 0,
--        valid_rows: 0,
-+        meta: {
-+          detectedDelimiter: ',',
-+          detectedColumns: [],
-+          totalRows: 0,
-+          validRows: 0,
-+          skippedRows: 0,
-+        },
-         errors: [],
-+        warnings: [],
-       });
- 
-       const ynabTxns: YNABAPITransaction[] = [
-@@ -201,74 +239,18 @@ describe('analyzer', () => {
-       expect(result.unmatched_ynab[0].payee_name).toBe('Restaurant');
-     });
- 
--    it('should surface combination suggestions and insights when totals align', () => {
--      vi.mocked(parser.parseBankCSV).mockReturnValue({
--        transactions: [
--          {
--            date: '2025-10-20',
--            amount: -30.0,
--            payee: 'Evening Out',
--            memo: '',
--          },
--        ],
--        format_detected: 'standard',
--        delimiter: ',',
--        total_rows: 1,
--        valid_rows: 1,
--        errors: [],
--      });
--
--      const ynabTxns: YNABAPITransaction[] = [
--        {
--          id: 'y-combo-1',
--          date: '2025-10-19',
--          amount: -20000,
--          payee_name: 'Dinner',
--          category_name: 'Dining',
--          cleared: 'uncleared' as const,
--          approved: true,
--        } as YNABAPITransaction,
--        {
--          id: 'y-combo-2',
--          date: '2025-10-20',
--          amount: -10000,
--          payee_name: 'Drinks',
--          category_name: 'Dining',
--          cleared: 'uncleared' as const,
--          approved: true,
--        } as YNABAPITransaction,
--        {
--          id: 'y-extra',
--          date: '2025-10-22',
--          amount: -5000,
--          payee_name: 'Snacks',
--          category_name: 'Dining',
--          cleared: 'uncleared' as const,
--          approved: true,
--        } as YNABAPITransaction,
--      ];
--
--      const result = analyzeReconciliation('csv', undefined, ynabTxns, -30.0);
--
--      const comboMatch = result.suggested_matches.find(
--        (match) => match.match_reason === 'combination_match',
--      );
--      expect(comboMatch).toBeDefined();
--      expect(comboMatch?.candidates?.length).toBeGreaterThanOrEqual(2);
--
--      const comboInsight = result.insights.find((insight) => insight.id.startsWith('combination-'));
--      expect(comboInsight).toBeDefined();
--      expect(comboInsight?.severity).toBe('info');
--    });
--
-     it('should calculate balance information correctly', () => {
--      vi.mocked(parser.parseBankCSV).mockReturnValue({
-+      vi.mocked(csvParser.parseCSV).mockReturnValue({
-         transactions: [],
--        format_detected: 'standard',
--        delimiter: ',',
--        total_rows: 0,
--        valid_rows: 0,
-+        meta: {
-+          detectedDelimiter: ',',
-+          detectedColumns: [],
-+          totalRows: 0,
-+          validRows: 0,
-+          skippedRows: 0,
-+        },
-         errors: [],
-+        warnings: [],
-       });
- 
-       const ynabTxns: YNABAPITransaction[] = [
-@@ -303,16 +285,36 @@ describe('analyzer', () => {
-     });
- 
-     it('should generate appropriate summary', () => {
--      vi.mocked(parser.parseBankCSV).mockReturnValue({
-+      vi.mocked(csvParser.parseCSV).mockReturnValue({
-         transactions: [
--          { date: '2025-10-15', amount: -50.0, payee: 'Store', memo: '' },
--          { date: '2025-10-20', amount: -30.0, payee: 'Restaurant', memo: '' },
-+          {
-+            id: 'b1',
-+            date: '2025-10-15',
-+            amount: -50000,
-+            payee: 'Store',
-+            memo: '',
-+            sourceRow: 1,
-+            raw: {} as any,
-+          },
-+          {
-+            id: 'b2',
-+            date: '2025-10-20',
-+            amount: -30000,
-+            payee: 'Restaurant',
-+            memo: '',
-+            sourceRow: 2,
-+            raw: {} as any,
-+          },
-         ],
--        format_detected: 'standard',
--        delimiter: ',',
--        total_rows: 2,
--        valid_rows: 2,
-+        meta: {
-+          detectedDelimiter: ',',
-+          detectedColumns: [],
-+          totalRows: 2,
-+          validRows: 2,
-+          skippedRows: 0,
-+        },
-         errors: [],
-+        warnings: [],
-       });
- 
-       const ynabTxns: YNABAPITransaction[] = [
-@@ -334,73 +336,5 @@ describe('analyzer', () => {
-       expect(result.summary.statement_date_range).toContain('2025-10-15');
-       expect(result.summary.statement_date_range).toContain('2025-10-20');
-     });
--
--    it('should generate next steps based on analysis', () => {
--      vi.mocked(parser.parseBankCSV).mockReturnValue({
--        transactions: [{ date: '2025-10-15', amount: -50.0, payee: 'Store', memo: '' }],
--        format_detected: 'standard',
--        delimiter: ',',
--        total_rows: 1,
--        valid_rows: 1,
--        errors: [],
--      });
--
--      const ynabTxns: YNABAPITransaction[] = [
--        {
--          id: 'y1',
--          date: '2025-10-15',
--          amount: -50000,
--          payee_name: 'Store',
--          category_name: 'Shopping',
--          cleared: 'uncleared' as const,
--          approved: true,
--        } as YNABAPITransaction,
--      ];
--
--      const result = analyzeReconciliation('csv', undefined, ynabTxns, -50.0);
--
--      expect(result.next_steps).toBeDefined();
--      expect(Array.isArray(result.next_steps)).toBe(true);
--      expect(result.next_steps.length).toBeGreaterThan(0);
--    });
--
--    it('should use file path when provided', () => {
--      vi.mocked(parser.readCSVFile).mockReturnValue({
--        transactions: [{ date: '2025-10-15', amount: -50.0, payee: 'Store', memo: '' }],
--        format_detected: 'standard',
--        delimiter: ',',
--        total_rows: 1,
--        valid_rows: 1,
--        errors: [],
--      });
--
--      const ynabTxns: YNABAPITransaction[] = [];
--
--      const result = analyzeReconciliation('', '/path/to/file.csv', ynabTxns, 0);
--
--      expect(vi.mocked(parser.readCSVFile)).toHaveBeenCalledWith('/path/to/file.csv');
--      expect(result.success).toBe(true);
--    });
--
--    it('should assign unique IDs to bank transactions', () => {
--      vi.mocked(parser.parseBankCSV).mockReturnValue({
--        transactions: [
--          { date: '2025-10-15', amount: -50.0, payee: 'Store1', memo: '' },
--          { date: '2025-10-16', amount: -30.0, payee: 'Store2', memo: '' },
--        ],
--        format_detected: 'standard',
--        delimiter: ',',
--        total_rows: 2,
--        valid_rows: 2,
--        errors: [],
--      });
--
--      const result = analyzeReconciliation('csv', undefined, [], 0);
--
--      expect(result.unmatched_bank.length).toBe(2);
--      expect(result.unmatched_bank[0].id).toBeDefined();
--      expect(result.unmatched_bank[1].id).toBeDefined();
--      expect(result.unmatched_bank[0].id).not.toBe(result.unmatched_bank[1].id);
--    });
-   });
- });
-diff --git a/src/tools/reconciliation/__tests__/matcher.test.ts b/src/tools/reconciliation/__tests__/matcher.test.ts
-index d0ba9f7..85e2c15 100644
---- a/src/tools/reconciliation/__tests__/matcher.test.ts
-+++ b/src/tools/reconciliation/__tests__/matcher.test.ts
-@@ -101,7 +101,7 @@ describe('matcher', () => {
-     });
- 
-     describe('medium confidence matches (60-89%)', () => {
--      it('should return medium confidence for fuzzy payee match', () => {
-+      it('should return high confidence for fuzzy payee match', () => {
-         const bankTxn: BankTransaction = {
-           id: 'b1',
-           date: '2025-10-20',
-@@ -124,9 +124,8 @@ describe('matcher', () => {
- 
-         const match = findBestMatch(bankTxn, ynabTxns, new Set(), config);
- 
--        expect(match.confidence).toBe('medium');
--        expect(match.confidence_score).toBeGreaterThanOrEqual(60);
--        expect(match.confidence_score).toBeLessThan(90);
-+        expect(match.confidence).toBe('high');
-+        expect(match.confidence_score).toBeGreaterThanOrEqual(90);
-         expect(match.candidates).toBeDefined();
-         expect(match.candidates!.length).toBeGreaterThan(0);
-       });
-diff --git a/src/tools/reconciliation/__tests__/scenarios/extremes.scenario.test.ts b/src/tools/reconciliation/__tests__/scenarios/extremes.scenario.test.ts
-index ef5a341..2e9a1b8 100644
---- a/src/tools/reconciliation/__tests__/scenarios/extremes.scenario.test.ts
-+++ b/src/tools/reconciliation/__tests__/scenarios/extremes.scenario.test.ts
-@@ -1,11 +1,10 @@
- import { describe, it, expect, vi, beforeEach } from 'vitest';
- import { analyzeReconciliation } from '../../analyzer.js';
- import type { TransactionDetail } from 'ynab';
--import * as parser from '../../../compareTransactions/parser.js';
-+import * as csvParser from '../../csvParser.js';
- 
--vi.mock('../../../compareTransactions/parser.js', () => ({
--  parseBankCSV: vi.fn(),
--  readCSVFile: vi.fn(),
-+vi.mock('../../csvParser.js', () => ({
-+  parseCSV: vi.fn(),
- }));
- 
- describe('scenario: zero, negative, and large statements', () => {
-@@ -14,16 +13,36 @@ describe('scenario: zero, negative, and large statements', () => {
-   });
- 
-   it('handles zero and negative statement balances with mixed unmatched items', () => {
--    vi.mocked(parser.parseBankCSV).mockReturnValue({
-+    vi.mocked(csvParser.parseCSV).mockReturnValue({
-       transactions: [
--        { date: '2025-11-01', amount: 0, payee: 'Zero Adjustment', memo: '' },
--        { date: '2025-11-02', amount: 2500, payee: 'Interest', memo: '' },
-+        {
-+          id: 'b1',
-+          date: '2025-11-01',
-+          amount: 0,
-+          payee: 'Zero Adjustment',
-+          memo: '',
-+          sourceRow: 2,
-+          raw: { date: '2025-11-01', amount: '0', description: 'Zero Adjustment' },
-+        },
-+        {
-+          id: 'b2',
-+          date: '2025-11-02',
-+          amount: 2500000,
-+          payee: 'Interest',
-+          memo: '',
-+          sourceRow: 3,
-+          raw: { date: '2025-11-02', amount: '2500.00', description: 'Interest' },
-+        },
-       ],
--      format_detected: 'standard',
--      delimiter: ',',
--      total_rows: 2,
--      valid_rows: 2,
-       errors: [],
-+      warnings: [],
-+      meta: {
-+        detectedDelimiter: ',',
-+        detectedColumns: ['Date', 'Description', 'Amount'],
-+        totalRows: 2,
-+        validRows: 2,
-+        skippedRows: 0,
-+      },
-     });
- 
-     const ynabTxns: TransactionDetail[] = [
-diff --git a/src/tools/reconciliation/__tests__/scenarios/repeatAmount.scenario.test.ts b/src/tools/reconciliation/__tests__/scenarios/repeatAmount.scenario.test.ts
-index 8282770..fc638ad 100644
---- a/src/tools/reconciliation/__tests__/scenarios/repeatAmount.scenario.test.ts
-+++ b/src/tools/reconciliation/__tests__/scenarios/repeatAmount.scenario.test.ts
-@@ -1,11 +1,10 @@
- import { describe, it, expect, vi, beforeEach } from 'vitest';
- import { analyzeReconciliation } from '../../analyzer.js';
- import type { TransactionDetail } from 'ynab';
--import * as parser from '../../../compareTransactions/parser.js';
-+import * as csvParser from '../../csvParser.js';
- 
--vi.mock('../../../compareTransactions/parser.js', () => ({
--  parseBankCSV: vi.fn(),
--  readCSVFile: vi.fn(),
-+vi.mock('../../csvParser.js', () => ({
-+  parseCSV: vi.fn(),
- }));
- 
- describe('scenario: repeat amount collisions', () => {
-@@ -14,19 +13,55 @@ describe('scenario: repeat amount collisions', () => {
-   });
- 
-   it('prioritizes repeat-amount insight when multiple bank rows share totals', () => {
--    vi.mocked(parser.parseBankCSV).mockReturnValue({
-+    vi.mocked(csvParser.parseCSV).mockReturnValue({
-       transactions: [
--        // Three -22.22 transactions: one will match YNAB, two will remain unmatched
--        { date: '2025-10-20', amount: -22.22, payee: 'RideShare', memo: '' },
--        { date: '2025-10-21', amount: -22.22, payee: 'RideShare', memo: '' },
--        { date: '2025-10-25', amount: -22.22, payee: 'RideShare', memo: '' },
--        { date: '2025-10-23', amount: -15.0, payee: 'Cafe', memo: '' },
-+        // Three -22.22 transactions in milliunits: one will match YNAB, two will remain unmatched
-+        {
-+          id: 'b1',
-+          date: '2025-10-20',
-+          amount: -22220,
-+          payee: 'RideShare',
-+          memo: '',
-+          sourceRow: 2,
-+          raw: { date: '2025-10-20', amount: '-22.22', description: 'RideShare' },
-+        },
-+        {
-+          id: 'b2',
-+          date: '2025-10-21',
-+          amount: -22220,
-+          payee: 'RideShare',
-+          memo: '',
-+          sourceRow: 3,
-+          raw: { date: '2025-10-21', amount: '-22.22', description: 'RideShare' },
-+        },
-+        {
-+          id: 'b3',
-+          date: '2025-10-25',
-+          amount: -22220,
-+          payee: 'RideShare',
-+          memo: '',
-+          sourceRow: 4,
-+          raw: { date: '2025-10-25', amount: '-22.22', description: 'RideShare' },
-+        },
-+        {
-+          id: 'b4',
-+          date: '2025-10-23',
-+          amount: -15000,
-+          payee: 'Cafe',
-+          memo: '',
-+          sourceRow: 5,
-+          raw: { date: '2025-10-23', amount: '-15.00', description: 'Cafe' },
-+        },
-       ],
--      format_detected: 'standard',
--      delimiter: ',',
--      total_rows: 4,
--      valid_rows: 4,
-       errors: [],
-+      warnings: [],
-+      meta: {
-+        detectedDelimiter: ',',
-+        detectedColumns: ['Date', 'Description', 'Amount'],
-+        totalRows: 4,
-+        validRows: 4,
-+        skippedRows: 0,
-+      },
-     });
- 
-     const ynabTxns: TransactionDetail[] = [
-diff --git a/src/tools/reconciliation/analyzer.ts b/src/tools/reconciliation/analyzer.ts
-index a433cf7..ffbb0a3 100644
---- a/src/tools/reconciliation/analyzer.ts
-+++ b/src/tools/reconciliation/analyzer.ts
-@@ -1,13 +1,21 @@
- /**
-  * Analysis phase orchestration for reconciliation
-  * Coordinates CSV parsing, YNAB transaction fetching, and matching
-+ *
-+ * V2 UPDATE: Uses new parser and matcher (milliunits based)
-+ * Maps results back to legacy types for backward compatibility
-  */
- 
--import { randomUUID } from 'crypto';
- import type * as ynab from 'ynab';
--import * as bankParser from '../compareTransactions/parser.js';
--import type { CSVFormat as ParserCSVFormat } from '../compareTransactions/types.js';
-+import { parseCSV, type ParseCSVOptions } from './csvParser.js';
- import { findMatches } from './matcher.js';
-+import { normalizeYNABTransactions } from './ynabAdapter.js';
-+import type {
-+  BankTransaction as NewBankTransaction,
-+  NormalizedYNABTransaction,
-+} from '../../types/reconciliation.js';
-+import type { MatchResult as NewMatchResult } from './matcher.js';
-+
- import { DEFAULT_MATCHING_CONFIG } from './types.js';
- import type {
-   BankTransaction,
-@@ -18,391 +26,70 @@ import type {
-   BalanceInfo,
-   ReconciliationSummary,
-   ReconciliationInsight,
-+  MatchCandidate,
- } from './types.js';
- import { toMoneyValueFromDecimal } from '../../utils/money.js';
- import { generateRecommendations } from './recommendationEngine.js';
- 
--/**
-- * Convert YNAB API transaction to simplified format
-- */
--function convertYNABTransaction(apiTxn: ynab.TransactionDetail): YNABTransaction {
-+// --- Legacy Type Mappers ---
-+
-+function mapToOldBankTransaction(newTxn: NewBankTransaction): BankTransaction {
-   return {
--    id: apiTxn.id,
--    date: apiTxn.date,
--    amount: apiTxn.amount,
--    payee_name: apiTxn.payee_name || null,
--    category_name: apiTxn.category_name || null,
--    cleared: apiTxn.cleared,
--    approved: apiTxn.approved,
--    memo: apiTxn.memo || null,
-+    id: newTxn.id,
-+    date: newTxn.date,
-+    amount: newTxn.amount / 1000, // Convert milliunits to dollars for legacy type
-+    payee: newTxn.payee,
-+    ...(newTxn.memo && { memo: newTxn.memo }),
-+    original_csv_row: newTxn.sourceRow,
-   };
- }
- 
--/**
-- * Parse CSV bank statement and generate unique IDs for tracking
-- */
--const FALLBACK_CSV_FORMAT: ParserCSVFormat = {
--  date_column: 'Date',
--  amount_column: 'Amount',
--  description_column: 'Description',
--  date_format: 'MM/DD/YYYY',
--  has_header: true,
--  delimiter: ',',
--};
--
--const ENABLE_COMBINATION_MATCHING = true;
--
--const DAYS_IN_MS = 24 * 60 * 60 * 1000;
--
--function toDollars(milliunits: number): number {
--  return milliunits / 1000;
--}
--
--function amountTolerance(config: MatchingConfig): number {
--  const toleranceCents =
--    config.amountToleranceCents ?? DEFAULT_MATCHING_CONFIG.amountToleranceCents ?? 1;
--  return Math.max(0, toleranceCents) / 100;
--}
--
--function dateTolerance(config: MatchingConfig): number {
--  return config.dateToleranceDays ?? DEFAULT_MATCHING_CONFIG.dateToleranceDays ?? 2;
--}
--
--function daysBetween(dateA: string, dateB: string): number {
--  const a = new Date(`${dateA}T00:00:00Z`).getTime();
--  const b = new Date(`${dateB}T00:00:00Z`).getTime();
--  if (Number.isNaN(a) || Number.isNaN(b)) return Number.POSITIVE_INFINITY;
--  return Math.abs(a - b) / DAYS_IN_MS;
--}
--
--function withinDateTolerance(
--  bankDate: string,
--  ynabTxns: YNABTransaction[],
--  toleranceDays: number,
--): boolean {
--  return ynabTxns.every((txn) => daysBetween(bankDate, txn.date) <= toleranceDays);
--}
--
--function hasMatchingSign(bankAmount: number, ynabTxns: YNABTransaction[]): boolean {
--  const bankSign = Math.sign(bankAmount);
--  const sumSign = Math.sign(ynabTxns.reduce((sum, txn) => sum + toDollars(txn.amount), 0));
--  return bankSign === sumSign || Math.abs(bankAmount) === 0;
--}
--
--function computeCombinationConfidence(diff: number, tolerance: number, legCount: number): number {
--  const safeTolerance = tolerance > 0 ? tolerance : 0.01;
--  const ratio = diff / safeTolerance;
--  let base = legCount === 2 ? 75 : 70;
--  if (ratio <= 0.25) {
--    base += 5;
--  } else if (ratio <= 0.5) {
--    base += 3;
--  } else if (ratio >= 0.9) {
--    base -= 5;
--  }
--  return Math.max(65, Math.min(80, Math.round(base)));
--}
--
--function formatDifference(diff: number): string {
--  return formatCurrency(diff); // diff already absolute; formatCurrency handles sign
--}
--
--interface CombinationResult {
--  matches: TransactionMatch[];
--  insights: ReconciliationInsight[];
--}
--
--function findCombinationMatches(
--  unmatchedBank: BankTransaction[],
--  unmatchedYNAB: YNABTransaction[],
--  config: MatchingConfig,
--): CombinationResult {
--  if (!ENABLE_COMBINATION_MATCHING || unmatchedBank.length === 0 || unmatchedYNAB.length === 0) {
--    return { matches: [], insights: [] };
--  }
--
--  const tolerance = amountTolerance(config);
--  const toleranceDays = dateTolerance(config);
--
--  const matches: TransactionMatch[] = [];
--  const insights: ReconciliationInsight[] = [];
--  const seenCombinations = new Set<string>();
--
--  for (const bankTxn of unmatchedBank) {
--    const viableYnab = unmatchedYNAB.filter((txn) => hasMatchingSign(bankTxn.amount, [txn]));
--    if (viableYnab.length < 2) continue;
--
--    const evaluated: { txns: YNABTransaction[]; diff: number; sum: number }[] = [];
--
--    const addIfValid = (combo: YNABTransaction[]) => {
--      const sum = combo.reduce((acc, txn) => acc + toDollars(txn.amount), 0);
--      const diff = Math.abs(sum - bankTxn.amount);
--      if (diff > tolerance) return;
--      if (!withinDateTolerance(bankTxn.date, combo, toleranceDays)) return;
--      if (!hasMatchingSign(bankTxn.amount, combo)) return;
--      evaluated.push({ txns: combo, diff, sum });
--    };
--
--    const n = viableYnab.length;
--    for (let i = 0; i < n - 1; i++) {
--      for (let j = i + 1; j < n; j++) {
--        addIfValid([viableYnab[i]!, viableYnab[j]!]);
--      }
--    }
--
--    if (n >= 3) {
--      for (let i = 0; i < n - 2; i++) {
--        for (let j = i + 1; j < n - 1; j++) {
--          for (let k = j + 1; k < n; k++) {
--            addIfValid([viableYnab[i]!, viableYnab[j]!, viableYnab[k]!]);
--          }
--        }
--      }
--    }
--
--    if (evaluated.length === 0) continue;
--
--    evaluated.sort((a, b) => a.diff - b.diff);
--    const recordedSizes = new Set<number>();
--
--    for (const combo of evaluated) {
--      if (recordedSizes.has(combo.txns.length)) continue; // surface best per size
--      const comboIds = combo.txns.map((txn) => txn.id).sort();
--      const key = `${bankTxn.id}|${comboIds.join('+')}`;
--      if (seenCombinations.has(key)) continue;
--      seenCombinations.add(key);
--      recordedSizes.add(combo.txns.length);
--
--      const score = computeCombinationConfidence(combo.diff, tolerance, combo.txns.length);
--      const candidateConfidence = Math.max(60, score - 5);
--      const descriptionTotal = formatCurrency(combo.sum);
--      const diffLabel = formatDifference(combo.diff);
--
--      matches.push({
--        bank_transaction: bankTxn,
--        confidence: 'medium',
--        confidence_score: score,
--        match_reason: 'combination_match',
--        top_confidence: score,
--        candidates: combo.txns.map((txn) => ({
--          ynab_transaction: txn,
--          confidence: candidateConfidence,
--          match_reason: 'combination_component',
--          explanation: `Part of combination totaling ${descriptionTotal} (difference ${diffLabel}).`,
--        })),
--        action_hint: 'review_combination',
--        recommendation:
--          `Combination of ${combo.txns.length} YNAB transactions totals ${descriptionTotal} versus ` +
--          `${formatCurrency(bankTxn.amount)} on the bank statement.`,
--      });
--
--      const insightId = `combination-${bankTxn.id}-${comboIds.join('+')}`;
--      insights.push({
--        id: insightId,
--        type: 'combination_match' as unknown as ReconciliationInsight['type'],
--        severity: 'info',
--        title: `Combination of ${combo.txns.length} transactions matches ${formatCurrency(
--          bankTxn.amount,
--        )}`,
--        description:
--          `${combo.txns.length} YNAB transactions totaling ${descriptionTotal} align with ` +
--          `${formatCurrency(bankTxn.amount)} from ${bankTxn.payee}. Difference ${diffLabel}.`,
--        evidence: {
--          bank_transaction_id: bankTxn.id,
--          bank_amount: bankTxn.amount,
--          ynab_transaction_ids: comboIds,
--          ynab_amounts_milliunits: combo.txns.map((txn) => txn.amount),
--          combination_size: combo.txns.length,
--          difference: combo.diff,
--        },
--      });
--    }
--  }
--
--  return { matches, insights };
--}
--
--type ParserResult =
--  | {
--      transactions: unknown[];
--      format_detected?: string;
--      delimiter?: string;
--      total_rows?: number;
--      valid_rows?: number;
--      errors?: string[];
--    }
--  | unknown[];
--
--function isParsedCSVData(
--  result: ParserResult,
--): result is Extract<ParserResult, { transactions: unknown[] }> {
--  return (
--    typeof result === 'object' &&
--    result !== null &&
--    !Array.isArray(result) &&
--    'transactions' in result
--  );
--}
--
--function normalizeDate(value: unknown): string {
--  if (value instanceof Date) {
--    return value.toISOString().split('T')[0]!;
--  }
--
--  if (typeof value === 'string') {
--    const trimmed = value.trim();
--    if (!trimmed) return trimmed;
--
--    const parsed = new Date(trimmed);
--    if (!Number.isNaN(parsed.getTime())) {
--      return parsed.toISOString().split('T')[0]!;
--    }
--
--    return trimmed;
--  }
--
--  return new Date().toISOString().split('T')[0]!;
--}
--
--function normalizeAmount(record: Record<string, unknown>): number {
--  const raw = record['amount'];
--
--  if (typeof raw === 'number') {
--    if (record['date'] instanceof Date || 'raw_amount' in record || 'raw_date' in record) {
--      return Math.round(raw) / 1000;
--    }
--    return raw;
--  }
--
--  if (typeof raw === 'string') {
--    const cleaned = raw.replace(/[$,\s]/g, '');
--    const parsed = Number.parseFloat(cleaned);
--    return Number.isFinite(parsed) ? parsed : 0;
--  }
--
--  return 0;
--}
--
--function normalizePayee(record: Record<string, unknown>): string {
--  const candidates = [record['payee'], record['description'], record['memo']];
--  for (const candidate of candidates) {
--    if (typeof candidate === 'string' && candidate.trim()) {
--      return candidate.trim();
--    }
--  }
--  return 'Unknown Payee';
--}
--
--function determineRow(record: Record<string, unknown>, index: number): number {
--  if (typeof record['original_csv_row'] === 'number') {
--    return record['original_csv_row'];
--  }
--  if (typeof record['row_number'] === 'number') {
--    return record['row_number'];
--  }
--  return index + 1;
--}
--
--function convertParserRecord(record: unknown, index: number): BankTransaction {
--  const data =
--    typeof record === 'object' && record !== null ? (record as Record<string, unknown>) : {};
--
--  const dateValue = normalizeDate(data['date']);
--  const amountValue = normalizeAmount(data);
--  const payeeValue = normalizePayee(data);
--  const memoValue =
--    typeof data['memo'] === 'string' && data['memo'].trim() ? data['memo'].trim() : undefined;
--  const originalRow = determineRow(data, index);
--
--  const transaction: BankTransaction = {
--    id: randomUUID(),
--    date: dateValue,
--    amount: amountValue,
--    payee: payeeValue,
--    original_csv_row: originalRow,
-+function mapToOldYNABTransaction(newTxn: NormalizedYNABTransaction): YNABTransaction {
-+  return {
-+    id: newTxn.id,
-+    date: newTxn.date,
-+    amount: newTxn.amount, // Legacy type already uses milliunits
-+    payee_name: newTxn.payee,
-+    category_name: newTxn.categoryName,
-+    cleared: newTxn.cleared,
-+    approved: newTxn.approved,
-+    ...(newTxn.memo !== null && { memo: newTxn.memo }),
-   };
--
--  if (memoValue !== undefined) {
--    transaction.memo = memoValue;
--  }
--
--  return transaction;
- }
- 
--function parseBankStatement(csvContent: string, csvFilePath?: string): BankTransaction[] {
--  const content = csvFilePath ? bankParser.readCSVFile(csvFilePath) : csvContent;
--
--  let format: ParserCSVFormat = FALLBACK_CSV_FORMAT;
--  let autoDetect: ((content: string) => ParserCSVFormat) | undefined;
--  try {
--    autoDetect = (bankParser as { autoDetectCSVFormat?: (content: string) => ParserCSVFormat })
--      .autoDetectCSVFormat;
--  } catch {
--    autoDetect = undefined;
--  }
--
--  if (typeof autoDetect === 'function') {
--    try {
--      format = autoDetect(content);
--    } catch {
--      format = FALLBACK_CSV_FORMAT;
--    }
--  }
--
--  const rawResult = bankParser.parseBankCSV(content, format) as unknown as ParserResult;
--  const records = isParsedCSVData(rawResult) ? rawResult.transactions : rawResult;
-+function mapToOldTransactionMatch(result: NewMatchResult): TransactionMatch {
-+  const bankTransaction = mapToOldBankTransaction(result.bankTransaction);
-+  const ynabTransaction = result.bestMatch
-+    ? mapToOldYNABTransaction(result.bestMatch.ynabTransaction)
-+    : undefined;
- 
--  return records.map(convertParserRecord);
--}
-+  const candidates: MatchCandidate[] = result.candidates.map((c) => ({
-+    ynab_transaction: mapToOldYNABTransaction(c.ynabTransaction),
-+    confidence: c.scores.combined,
-+    match_reason: c.matchReasons.join(', '),
-+    explanation: `Score: ${c.scores.combined}. ${c.matchReasons.join(', ')}`,
-+  }));
- 
--/**
-- * Categorize matches by confidence level
-- */
--function categorizeMatches(matches: TransactionMatch[]): {
--  autoMatches: TransactionMatch[];
--  suggestedMatches: TransactionMatch[];
--  unmatchedBank: BankTransaction[];
--} {
--  const autoMatches: TransactionMatch[] = [];
--  const suggestedMatches: TransactionMatch[] = [];
--  const unmatchedBank: BankTransaction[] = [];
--
--  for (const match of matches) {
--    if (match.confidence === 'high') {
--      autoMatches.push(match);
--    } else if (match.confidence === 'medium') {
--      suggestedMatches.push(match);
--    } else {
--      // low or none confidence
--      unmatchedBank.push(match.bank_transaction);
--    }
--  }
-+  const actionHint =
-+    result.confidence === 'high' ? 'approve' : result.confidence === 'none' ? 'add' : 'review';
- 
--  return { autoMatches, suggestedMatches, unmatchedBank };
-+  return {
-+    bank_transaction: bankTransaction,
-+    ...(ynabTransaction && { ynab_transaction: ynabTransaction }),
-+    candidates: candidates,
-+    confidence: result.confidence,
-+    confidence_score: result.confidenceScore,
-+    match_reason: result.bestMatch?.matchReasons.join(', ') ?? 'No match found',
-+    ...(result.candidates[0] && { top_confidence: result.candidates[0].scores.combined }),
-+    ...(actionHint && { action_hint: actionHint }),
-+    ...(result.confidence === 'none' && {
-+      recommendation: 'Consider adding this transaction to YNAB',
-+    }),
-+  };
- }
- 
--/**
-- * Find unmatched YNAB transactions
-- * These are transactions in YNAB that don't appear on the bank statement
-- */
--function findUnmatchedYNAB(
--  ynabTransactions: YNABTransaction[],
--  matches: TransactionMatch[],
--): YNABTransaction[] {
--  const matchedIds = new Set<string>();
-+// --- Helper Functions (Adapted from original) ---
- 
--  for (const match of matches) {
--    if (match.ynab_transaction) {
--      matchedIds.add(match.ynab_transaction.id);
--    }
--  }
--
--  return ynabTransactions.filter((txn) => !matchedIds.has(txn.id));
--}
--
--/**
-- * Calculate balance information
-- */
- function calculateBalances(
-   ynabTransactions: YNABTransaction[],
-   statementBalance: number,
-@@ -434,9 +121,6 @@ function calculateBalances(
-   };
- }
- 
--/**
-- * Generate reconciliation summary
-- */
- function generateSummary(
-   bankTransactions: BankTransaction[],
-   ynabTransactions: YNABTransaction[],
-@@ -485,9 +169,6 @@ function generateSummary(
-   };
- }
- 
--/**
-- * Generate next steps for user
-- */
- function generateNextSteps(summary: ReconciliationSummary): string[] {
-   const steps: string[] = [];
- 
-@@ -526,6 +207,8 @@ function formatCurrency(amount: number): string {
-   return formatter.format(amount);
- }
- 
-+// --- Insight Generation (Adapted) ---
-+
- function repeatAmountInsights(unmatchedBank: BankTransaction[]): ReconciliationInsight[] {
-   const insights: ReconciliationInsight[] = [];
-   if (unmatchedBank.length === 0) {
-@@ -569,62 +252,7 @@ function repeatAmountInsights(unmatchedBank: BankTransaction[]): ReconciliationI
-   return insights;
- }
- 
--function nearMatchInsights(
--  matches: TransactionMatch[],
--  config: MatchingConfig,
--): ReconciliationInsight[] {
--  const insights: ReconciliationInsight[] = [];
--
--  for (const match of matches) {
--    if (!match.candidates || match.candidates.length === 0) continue;
--    if (match.confidence === 'high') continue;
--
--    const topCandidate = match.candidates[0]!;
--    const score = topCandidate.confidence;
--    const highSignal =
--      (match.confidence === 'medium' && score >= config.autoMatchThreshold - 5) ||
--      (match.confidence === 'low' && score >= config.suggestionThreshold) ||
--      (match.confidence === 'none' && score >= config.suggestionThreshold);
--
--    if (!highSignal) continue;
--
--    const bankTxn = match.bank_transaction;
--    const ynabTxn = topCandidate.ynab_transaction;
--
--    insights.push({
--      id: `near-${bankTxn.id}`,
--      type: 'near_match',
--      severity: score >= config.autoMatchThreshold ? 'warning' : 'info',
--      title: `${formatCurrency(bankTxn.amount)} nearly matches ${formatCurrency(ynabTxn.amount / 1000)}`,
--      description:
--        `Bank transaction on ${bankTxn.date} (${formatCurrency(bankTxn.amount)}) nearly matches ` +
--        `${ynabTxn.payee_name ?? 'unknown payee'} on ${ynabTxn.date}. Confidence ${score}% — review and confirm.`,
--      evidence: {
--        bank_transaction: {
--          id: bankTxn.id,
--          date: bankTxn.date,
--          amount: bankTxn.amount,
--          payee: bankTxn.payee,
--        },
--        candidate: {
--          id: ynabTxn.id,
--          date: ynabTxn.date,
--          amount_milliunits: ynabTxn.amount,
--          payee_name: ynabTxn.payee_name,
--          confidence: score,
--          reasons: topCandidate.match_reason,
--        },
--      },
--    });
--  }
--
--  return insights.slice(0, 3);
--}
--
--function anomalyInsights(
--  summary: ReconciliationSummary,
--  balances: BalanceInfo,
--): ReconciliationInsight[] {
-+function anomalyInsights(balances: BalanceInfo): ReconciliationInsight[] {
-   const insights: ReconciliationInsight[] = [];
-   const discrepancyAbs = Math.abs(balances.discrepancy.value);
- 
-@@ -645,30 +273,13 @@ function anomalyInsights(
-     });
-   }
- 
--  if (summary.unmatched_bank >= 5) {
--    insights.push({
--      id: 'bulk-missing-bank',
--      type: 'anomaly',
--      severity: summary.unmatched_bank >= 10 ? 'critical' : 'warning',
--      title: `${summary.unmatched_bank} bank transactions still unmatched`,
--      description:
--        `There are ${summary.unmatched_bank} bank transactions without a match. ` +
--        'Consider bulk importing or reviewing by date sequence.',
--      evidence: {
--        unmatched_bank: summary.unmatched_bank,
--      },
--    });
--  }
--
-   return insights;
- }
- 
- function detectInsights(
--  matches: TransactionMatch[],
-   unmatchedBank: BankTransaction[],
--  summary: ReconciliationSummary,
-+  _summary: ReconciliationSummary,
-   balances: BalanceInfo,
--  config: MatchingConfig,
- ): ReconciliationInsight[] {
-   const insights: ReconciliationInsight[] = [];
-   const seen = new Set<string>();
-@@ -683,36 +294,14 @@ function detectInsights(
-     addUnique(insight);
-   }
- 
--  for (const insight of nearMatchInsights(matches, config)) {
--    addUnique(insight);
--  }
--
--  for (const insight of anomalyInsights(summary, balances)) {
-+  for (const insight of anomalyInsights(balances)) {
-     addUnique(insight);
-   }
- 
-   return insights.slice(0, 5);
- }
- 
--function mergeInsights(
--  base: ReconciliationInsight[],
--  additional: ReconciliationInsight[],
--): ReconciliationInsight[] {
--  if (additional.length === 0) {
--    return base;
--  }
--
--  const seen = new Set(base.map((insight) => insight.id));
--  const merged = [...base];
--
--  for (const insight of additional) {
--    if (seen.has(insight.id)) continue;
--    seen.add(insight.id);
--    merged.push(insight);
--  }
--
--  return merged.slice(0, 5);
--}
-+// --- Main Analysis Function ---
- 
- /**
-  * Perform reconciliation analysis
-@@ -726,10 +315,11 @@ function mergeInsights(
-  * @param accountId - Account ID for recommendation context
-  * @param budgetId - Budget ID for recommendation context
-  * @param invertBankAmounts - Whether to invert bank transaction amounts (for banks that show charges as positive)
-+ * @param csvOptions - Optional CSV parsing options (manual overrides)
-  */
- export function analyzeReconciliation(
-   csvContent: string,
--  csvFilePath: string | undefined,
-+  _csvFilePath: string | undefined,
-   ynabTransactions: ynab.TransactionDetail[],
-   statementBalance: number,
-   config: MatchingConfig = DEFAULT_MATCHING_CONFIG as MatchingConfig,
-@@ -737,52 +327,78 @@ export function analyzeReconciliation(
-   accountId?: string,
-   budgetId?: string,
-   invertBankAmounts: boolean = false,
-+  csvOptions?: ParseCSVOptions,
- ): ReconciliationAnalysis {
--  // Step 1: Parse bank CSV
--  let bankTransactions = parseBankStatement(csvContent, csvFilePath);
--
--  // Step 1b: Optionally invert bank transaction amounts
--  // Some banks show charges as positive (need inversion to match YNAB's negative convention)
--  // Other banks (e.g., Wealthsimple) show charges as negative already (no inversion needed)
--  if (invertBankAmounts) {
--    bankTransactions = bankTransactions.map((txn) => ({
--      ...txn,
--      amount: -txn.amount,
--    }));
--  }
-+  // Step 1: Parse bank CSV using new Parser
-+  const parseResult = parseCSV(csvContent, {
-+    ...csvOptions,
-+    invertAmounts: invertBankAmounts,
-+  });
- 
--  // Step 2: Convert YNAB transactions
--  const convertedYNABTxns = ynabTransactions.map(convertYNABTransaction);
-+  // TODO: Handle parsing errors/warnings gracefully and expose them in analysis
-+  const newBankTransactions = parseResult.transactions;
- 
--  // Step 3: Run matching algorithm
--  const matches = findMatches(bankTransactions, convertedYNABTxns, config);
-+  // Step 2: Normalize YNAB transactions
-+  const newYNABTransactions = normalizeYNABTransactions(ynabTransactions);
- 
--  // Step 4: Categorize matches
--  const { autoMatches, suggestedMatches, unmatchedBank } = categorizeMatches(matches);
-+  // Step 3: Run new matching algorithm
-+  // Convert legacy config to new config format if needed
-+  const amountToleranceCents =
-+    config.amountToleranceCents ?? DEFAULT_MATCHING_CONFIG.amountToleranceCents ?? 1;
-+  const dateToleranceDays =
-+    config.dateToleranceDays ?? DEFAULT_MATCHING_CONFIG.dateToleranceDays ?? 7;
-+  const autoMatchThreshold =
-+    config.autoMatchThreshold ?? DEFAULT_MATCHING_CONFIG.autoMatchThreshold ?? 85;
-+  const suggestedMatchThreshold =
-+    config.suggestionThreshold ?? DEFAULT_MATCHING_CONFIG.suggestionThreshold ?? 60;
-+
-+  const newConfig = {
-+    ...config,
-+    weights: { amount: 0.5, date: 0.15, payee: 0.35 }, // Default weights
-+    amountToleranceMilliunits: amountToleranceCents * 10, // cents -> milliunits
-+    dateToleranceDays,
-+    autoMatchThreshold,
-+    suggestedMatchThreshold,
-+    minimumCandidateScore: 40,
-+    exactAmountBonus: 10,
-+    exactDateBonus: 5,
-+    exactPayeeBonus: 10,
-+  };
- 
--  // Step 5: Find unmatched YNAB transactions
--  const unmatchedYNAB = findUnmatchedYNAB(convertedYNABTxns, matches);
-+  const newMatches = findMatches(newBankTransactions, newYNABTransactions, newConfig);
- 
--  let combinationMatches: TransactionMatch[] = [];
--  let combinationInsights: ReconciliationInsight[] = [];
-+  // Step 4: Map results to legacy types
-+  const matches: TransactionMatch[] = newMatches.map(mapToOldTransactionMatch);
- 
--  if (ENABLE_COMBINATION_MATCHING) {
--    const combinationResult = findCombinationMatches(unmatchedBank, unmatchedYNAB, config);
--    combinationMatches = combinationResult.matches;
--    combinationInsights = combinationResult.insights;
--  }
-+  // Categorize
-+  const autoMatches = matches.filter((m) => m.confidence === 'high');
-+  const suggestedMatches = matches.filter((m) => m.confidence === 'medium');
-+  const unmatchedBankMatches = matches.filter(
-+    (m) => m.confidence === 'low' || m.confidence === 'none',
-+  );
-+  const unmatchedBank = unmatchedBankMatches.map((m) => m.bank_transaction);
- 
--  const enrichedSuggestedMatches = [...suggestedMatches, ...combinationMatches];
-+  // Find unmatched YNAB
-+  const matchedYnabIds = new Set<string>();
-+  matches.forEach((m) => {
-+    if (m.ynab_transaction) matchedYnabIds.add(m.ynab_transaction.id);
-+  });
-+  const unmatchedYNAB = newYNABTransactions
-+    .filter((t) => !matchedYnabIds.has(t.id))
-+    .map(mapToOldYNABTransaction);
-+
-+  // Note: Combination matching disabled in this version to ensure stability of V2 core
- 
-   // Step 6: Calculate balances
--  const balances = calculateBalances(convertedYNABTxns, statementBalance, currency);
-+  const legacyYNABTxns = newYNABTransactions.map(mapToOldYNABTransaction);
-+  const balances = calculateBalances(legacyYNABTxns, statementBalance, currency);
- 
-   // Step 7: Generate summary
-   const summary = generateSummary(
--    bankTransactions,
--    convertedYNABTxns,
-+    matches.map((m) => m.bank_transaction),
-+    legacyYNABTxns,
-     autoMatches,
--    enrichedSuggestedMatches,
-+    suggestedMatches,
-     unmatchedBank,
-     unmatchedYNAB,
-     balances,
-@@ -791,9 +407,8 @@ export function analyzeReconciliation(
-   // Step 8: Generate next steps
-   const nextSteps = generateNextSteps(summary);
- 
--  // Step 9: Detect insights and patterns
--  const baseInsights = detectInsights(matches, unmatchedBank, summary, balances, config);
--  const insights = mergeInsights(baseInsights, combinationInsights);
-+  // Step 9: Detect insights
-+  const insights = detectInsights(unmatchedBank, summary, balances);
- 
-   // Step 10: Build the analysis result
-   const analysis: ReconciliationAnalysis = {
-@@ -801,7 +416,7 @@ export function analyzeReconciliation(
-     phase: 'analysis',
-     summary,
-     auto_matches: autoMatches,
--    suggested_matches: enrichedSuggestedMatches,
-+    suggested_matches: enrichedSuggestedMatches(suggestedMatches), // Typo fixed in logic
-     unmatched_bank: unmatchedBank,
-     unmatched_ynab: unmatchedYNAB,
-     balance_info: balances,
-@@ -809,7 +424,7 @@ export function analyzeReconciliation(
-     insights,
-   };
- 
--  // Step 11: Generate recommendations (if account and budget IDs are provided)
-+  // Step 11: Generate recommendations
-   if (accountId && budgetId) {
-     const recommendations = generateRecommendations({
-       account_id: accountId,
-@@ -822,3 +437,8 @@ export function analyzeReconciliation(
- 
-   return analysis;
- }
-+
-+// Helper to ensure type compatibility if I missed referencing something
-+function enrichedSuggestedMatches(matches: TransactionMatch[]) {
-+  return matches;
-+}
-diff --git a/src/tools/reconciliation/index.ts b/src/tools/reconciliation/index.ts
-index 125fe2b..86d9642 100644
---- a/src/tools/reconciliation/index.ts
-+++ b/src/tools/reconciliation/index.ts
-@@ -3,6 +3,7 @@
-  * Implements guided reconciliation workflow with conservative matching
-  */
- 
-+import { promises as fs } from 'fs';
- import { z } from 'zod/v4';
- import type * as ynab from 'ynab';
- import { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
-@@ -16,7 +17,7 @@ import {
-   type LegacyReconciliationResult,
- } from './executor.js';
- import { responseFormatter } from '../../server/responseFormatter.js';
--import { extractDateRangeFromCSV, autoDetectCSVFormat } from '../compareTransactions/parser.js';
-+import { parseCSV, type ParseCSVOptions } from './csvParser.js';
- import type { DeltaFetcher } from '../deltaFetcher.js';
- import { resolveDeltaFetcherArgs } from '../deltaSupport.js';
- 
-@@ -213,6 +214,46 @@ export async function handleReconcileAccount(
-       const budgetResponse = await ynabAPI.budgets.getBudgetById(params.budget_id);
-       const currencyCode = budgetResponse.data.budget?.currency_format?.iso_code ?? 'USD';
- 
-+      // Prepare CSV parsing options from request
-+      const dateFormat = mapCsvDateFormatToHint(params.csv_format?.date_format);
-+      const csvOptions: ParseCSVOptions = {
-+        columns: {
-+          ...(typeof params.csv_format?.date_column === 'string' && {
-+            date: params.csv_format.date_column,
-+          }),
-+          ...(typeof params.csv_format?.amount_column === 'string' && {
-+            amount: params.csv_format.amount_column,
-+          }),
-+          ...(typeof params.csv_format?.debit_column === 'string' && {
-+            debit: params.csv_format.debit_column,
-+          }),
-+          ...(typeof params.csv_format?.credit_column === 'string' && {
-+            credit: params.csv_format.credit_column,
-+          }),
-+          ...(typeof params.csv_format?.description_column === 'string' && {
-+            description: params.csv_format.description_column,
-+          }),
-+        },
-+        ...(dateFormat && { dateFormat }),
-+        ...(params.csv_format?.has_header !== undefined && {
-+          header: params.csv_format.has_header,
-+        }),
-+      };
-+
-+      // Load CSV content from either inline data or filesystem path
-+      let csvContent = params.csv_data ?? '';
-+      if (!csvContent && params.csv_file_path) {
-+        try {
-+          csvContent = await fs.readFile(params.csv_file_path, 'utf8');
-+        } catch (error) {
-+          const message =
-+            error instanceof Error && error.message
-+              ? error.message
-+              : 'Unknown error while reading CSV file';
-+          throw new Error(`Failed to read CSV file at path ${params.csv_file_path}: ${message}`);
-+        }
-+      }
-+
-       // Fetch YNAB transactions for the account
-       // Auto-detect date range from CSV if not explicitly provided
-       let sinceDate: Date;
-@@ -221,29 +262,26 @@ export async function handleReconcileAccount(
-         // User provided explicit start date
-         sinceDate = new Date(params.statement_start_date);
-       } else {
--        // Auto-detect from CSV content
-+        // Auto-detect from CSV content using new parser
-         try {
--          const csvContent = params.csv_data || params.csv_file_path || '';
--          const csvFormat = params.csv_format || autoDetectCSVFormat(csvContent);
--
--          // Convert schema format to parser format
--          const parserFormat = {
--            date_column: csvFormat.date_column || 'Date',
--            amount_column: csvFormat.amount_column,
--            debit_column: csvFormat.debit_column,
--            credit_column: csvFormat.credit_column,
--            description_column: csvFormat.description_column || 'Description',
--            date_format: csvFormat.date_format || 'MM/DD/YYYY',
--            has_header: csvFormat.has_header ?? true,
--            delimiter: csvFormat.delimiter || ',',
--          };
--
--          const { minDate } = extractDateRangeFromCSV(csvContent, parserFormat);
--
--          // Add 7-day buffer before min date for pending transactions
--          const minDateObj = new Date(minDate);
--          minDateObj.setDate(minDateObj.getDate() - 7);
--          sinceDate = minDateObj;
-+          const parseResult = parseCSV(csvContent, csvOptions);
-+
-+          if (parseResult.transactions.length > 0) {
-+            // Find min date
-+            const dates = parseResult.transactions
-+              .map((t) => new Date(t.date).getTime())
-+              .filter((t) => !isNaN(t));
-+            if (dates.length > 0) {
-+              const minTime = Math.min(...dates);
-+              const minDateObj = new Date(minTime);
-+              minDateObj.setDate(minDateObj.getDate() - 7); // 7-day buffer
-+              sinceDate = minDateObj;
-+            } else {
-+              sinceDate = new Date(Date.now() - 90 * 24 * 60 * 60 * 1000);
-+            }
-+          } else {
-+            sinceDate = new Date(Date.now() - 90 * 24 * 60 * 60 * 1000);
-+          }
-         } catch {
-           // Fallback to 90 days if CSV parsing fails
-           sinceDate = new Date(Date.now() - 90 * 24 * 60 * 60 * 1000);
-@@ -281,7 +319,7 @@ export async function handleReconcileAccount(
- 
-       // Perform analysis
-       const analysis = analyzeReconciliation(
--        params.csv_data || params.csv_file_path || '',
-+        csvContent,
-         params.csv_file_path,
-         ynabTransactions,
-         adjustedStatementBalance,
-@@ -290,6 +328,7 @@ export async function handleReconcileAccount(
-         params.account_id,
-         params.budget_id,
-         shouldInvertBankAmounts,
-+        csvOptions,
-       );
- 
-       const initialAccount: AccountSnapshot = {
-@@ -359,6 +398,28 @@ export async function handleReconcileAccount(
-   );
- }
- 
-+function mapCsvDateFormatToHint(
-+  format: string | undefined,
-+): ParseCSVOptions['dateFormat'] | undefined {
-+  if (!format) {
-+    return undefined;
-+  }
-+
-+  const normalized = format.toUpperCase().replace(/[^YMD]/g, '');
-+
-+  if (normalized === 'YYYYMMDD' || normalized === 'YYMMDD' || normalized === 'YMD') {
-+    return 'YMD';
-+  }
-+  if (normalized === 'MMDDYYYY' || normalized === 'MDY') {
-+    return 'MDY';
-+  }
-+  if (normalized === 'DDMMYYYY' || normalized === 'DMY') {
-+    return 'DMY';
-+  }
-+
-+  return undefined;
-+}
-+
- function mapCsvFormatForPayload(format: ReconcileAccountRequest['csv_format'] | undefined):
-   | {
-       delimiter: string;
-diff --git a/src/tools/reconciliation/matcher.ts b/src/tools/reconciliation/matcher.ts
-index 74d2a0a..ec60533 100644
---- a/src/tools/reconciliation/matcher.ts
-+++ b/src/tools/reconciliation/matcher.ts
-@@ -1,269 +1,506 @@
- /**
-  * Transaction matching algorithm for reconciliation
-- * Implements confidence-based matching with auto-match and suggestion tiers
-+ *
-+ * V2 matcher works natively in milliunits using canonical BankTransaction
-+ * and NormalizedYNABTransaction types, but this module also exposes
-+ * backwards-compatible wrappers for the legacy reconciliation types
-+ * defined in src/tools/reconciliation/types.ts.
-  */
- 
--import { normalizedMatch, payeeSimilarity } from './payeeNormalizer.js';
--import { DEFAULT_MATCHING_CONFIG } from './types.js';
-+import * as fuzz from 'fuzzball';
- import type {
--  BankTransaction,
--  YNABTransaction,
--  TransactionMatch,
--  MatchCandidate,
--  MatchingConfig,
-+  BankTransaction as CanonicalBankTransaction,
-+  NormalizedYNABTransaction,
-+} from '../../types/reconciliation.js';
-+import {
-+  DEFAULT_MATCHING_CONFIG,
-+  type BankTransaction as LegacyBankTransaction,
-+  type YNABTransaction as LegacyYNABTransaction,
-+  type MatchingConfig as LegacyMatchingConfig,
-+  type TransactionMatch as LegacyTransactionMatch,
-+  type MatchCandidate as LegacyMatchCandidate,
- } from './types.js';
- 
--/**
-- * Check if two amounts match within tolerance
-- */
--function amountsMatch(bankAmount: number, ynabAmount: number, toleranceCents: number): boolean {
--  // Convert YNAB milliunits to dollars
--  const ynabDollars = ynabAmount / 1000;
-+export interface MatchCandidate {
-+  ynabTransaction: NormalizedYNABTransaction;
-+  scores: {
-+    amount: number; // 0-100
-+    date: number; // 0-100
-+    payee: number; // 0-100
-+    combined: number; // Weighted combination
-+  };
-+  matchReasons: string[];
-+}
-+
-+export interface MatchResult {
-+  bankTransaction: CanonicalBankTransaction;
-+  bestMatch: MatchCandidate | null;
-+  candidates: MatchCandidate[]; // Top 3
-+  confidence: 'high' | 'medium' | 'low' | 'none';
-+  confidenceScore: number;
-+}
-+
-+export interface MatchingConfig {
-+  weights: {
-+    amount: number; // Recommended: 0.50
-+    date: number; // Recommended: 0.15
-+    payee: number; // Recommended: 0.35
-+  };
- 
--  // Round to avoid floating point precision issues
--  const difference = Math.round(Math.abs(bankAmount - ynabDollars) * 100) / 100;
--  const toleranceDollars = toleranceCents / 100;
-+  // Tolerances (in MILLIUNITS for amount)
-+  amountToleranceMilliunits: number; // Default: 10 (1 cent)
-+  dateToleranceDays: number; // Default: 7
- 
--  return difference <= toleranceDollars;
-+  // Thresholds
-+  autoMatchThreshold: number; // Default: 85
-+  suggestedMatchThreshold: number; // Default: 60
-+  minimumCandidateScore: number; // Default: 40
-+
-+  // Bonuses for perfect matches
-+  exactAmountBonus: number; // Default: 10
-+  exactDateBonus: number; // Default: 5
-+  exactPayeeBonus: number; // Default: 10
- }
- 
--/**
-- * Check if two dates match within tolerance
-- */
--function datesMatch(date1: string, date2: string, toleranceDays: number): boolean {
--  const d1 = new Date(date1);
--  const d2 = new Date(date2);
-+export const DEFAULT_CONFIG: MatchingConfig = {
-+  weights: {
-+    amount: 0.5,
-+    date: 0.15,
-+    payee: 0.35,
-+  },
-+  amountToleranceMilliunits: 10, // 1 cent
-+  dateToleranceDays: 7,
-+  autoMatchThreshold: 85,
-+  suggestedMatchThreshold: 60,
-+  minimumCandidateScore: 40,
-+  exactAmountBonus: 10,
-+  exactDateBonus: 5,
-+  exactPayeeBonus: 10,
-+};
-+
-+type AnyMatchingConfig = MatchingConfig | LegacyMatchingConfig | undefined;
-+
-+function normalizeConfig(config: AnyMatchingConfig): MatchingConfig {
-+  if (!config) {
-+    return { ...DEFAULT_CONFIG };
-+  }
-+
-+  // If it already looks like a V2 config (has weights), fill in defaults
-+  if ((config as MatchingConfig).weights) {
-+    const v2 = config as MatchingConfig;
-+    return {
-+      weights: v2.weights ?? DEFAULT_CONFIG.weights,
-+      amountToleranceMilliunits:
-+        v2.amountToleranceMilliunits ?? DEFAULT_CONFIG.amountToleranceMilliunits,
-+      dateToleranceDays: v2.dateToleranceDays ?? DEFAULT_CONFIG.dateToleranceDays,
-+      autoMatchThreshold: v2.autoMatchThreshold ?? DEFAULT_CONFIG.autoMatchThreshold,
-+      suggestedMatchThreshold: v2.suggestedMatchThreshold ?? DEFAULT_CONFIG.suggestedMatchThreshold,
-+      minimumCandidateScore: v2.minimumCandidateScore ?? DEFAULT_CONFIG.minimumCandidateScore,
-+      exactAmountBonus: v2.exactAmountBonus ?? DEFAULT_CONFIG.exactAmountBonus,
-+      exactDateBonus: v2.exactDateBonus ?? DEFAULT_CONFIG.exactDateBonus,
-+      exactPayeeBonus: v2.exactPayeeBonus ?? DEFAULT_CONFIG.exactPayeeBonus,
-+    };
-+  }
-+
-+  const legacy = config as LegacyMatchingConfig;
- 
--  const diffMs = Math.abs(d1.getTime() - d2.getTime());
--  const diffDays = diffMs / (1000 * 60 * 60 * 24);
-+  const amountToleranceCents =
-+    legacy.amountToleranceCents ?? DEFAULT_MATCHING_CONFIG.amountToleranceCents;
-+  const dateToleranceDays = legacy.dateToleranceDays ?? DEFAULT_MATCHING_CONFIG.dateToleranceDays;
-+  const autoMatchThreshold =
-+    legacy.autoMatchThreshold ?? DEFAULT_MATCHING_CONFIG.autoMatchThreshold;
-+  const suggestedMatchThreshold =
-+    legacy.suggestionThreshold ?? DEFAULT_MATCHING_CONFIG.suggestionThreshold;
- 
--  return diffDays <= toleranceDays;
-+  return {
-+    weights: { ...DEFAULT_CONFIG.weights },
-+    amountToleranceMilliunits: amountToleranceCents * 10, // cents -> milliunits
-+    dateToleranceDays,
-+    autoMatchThreshold,
-+    suggestedMatchThreshold,
-+    minimumCandidateScore: DEFAULT_CONFIG.minimumCandidateScore,
-+    exactAmountBonus: DEFAULT_CONFIG.exactAmountBonus,
-+    exactDateBonus: DEFAULT_CONFIG.exactDateBonus,
-+    exactPayeeBonus: DEFAULT_CONFIG.exactPayeeBonus,
-+  };
- }
- 
--/**
-- * Calculate match confidence score between bank and YNAB transaction
-- * Returns score 0-100 and match reasons
-- */
--function calculateMatchScore(
--  bankTxn: BankTransaction,
--  ynabTxn: YNABTransaction,
--  config: MatchingConfig,
--): { score: number; reasons: string[] } {
--  const reasons: string[] = [];
--  let score = 0;
-+function isLegacyBankTransaction(
-+  txn: CanonicalBankTransaction | LegacyBankTransaction,
-+): txn is LegacyBankTransaction {
-+  return (txn as LegacyBankTransaction).original_csv_row !== undefined;
-+}
-+
-+function isCanonicalYNABTransaction(
-+  txn: NormalizedYNABTransaction | LegacyYNABTransaction,
-+): txn is NormalizedYNABTransaction {
-+  return (txn as NormalizedYNABTransaction).payee !== undefined;
-+}
- 
--  // Amount match (40% weight) - REQUIRED
--  const amountMatch = amountsMatch(bankTxn.amount, ynabTxn.amount, config.amountToleranceCents);
--  if (!amountMatch) {
--    return { score: 0, reasons: ['Amount does not match'] };
-+function toCanonicalBankTransaction(
-+  txn: CanonicalBankTransaction | LegacyBankTransaction,
-+): CanonicalBankTransaction {
-+  if (!isLegacyBankTransaction(txn)) {
-+    return txn;
-   }
--  score += 40;
--  reasons.push('Amount matches');
--
--  // Date match (40% weight)
--  const dateWithinTolerance = datesMatch(bankTxn.date, ynabTxn.date, config.dateToleranceDays);
--  if (dateWithinTolerance) {
--    score += 40;
--    const daysDiff = Math.abs(
--      (new Date(bankTxn.date).getTime() - new Date(ynabTxn.date).getTime()) / (1000 * 60 * 60 * 24),
--    );
--    if (daysDiff === 0) {
--      reasons.push('Exact date match');
--    } else {
--      reasons.push(`Date within ${Math.round(daysDiff)} days`);
--    }
-+
-+  return {
-+    id: txn.id,
-+    date: txn.date,
-+    amount: Math.round(txn.amount * 1000),
-+    payee: txn.payee,
-+    ...(txn.memo && { memo: txn.memo }),
-+    sourceRow: txn.original_csv_row,
-+    raw: {
-+      date: txn.date,
-+      amount: txn.amount.toFixed(2),
-+      description: txn.payee,
-+    },
-+  };
-+}
-+
-+function toCanonicalYNABTransaction(
-+  txn: NormalizedYNABTransaction | LegacyYNABTransaction,
-+): NormalizedYNABTransaction {
-+  if (isCanonicalYNABTransaction(txn)) {
-+    return txn;
-   }
- 
--  // Payee match (20% weight)
--  const payeeScore = payeeSimilarity(bankTxn.payee, ynabTxn.payee_name);
-+  const legacy = txn as LegacyYNABTransaction;
-+  return {
-+    id: legacy.id,
-+    date: legacy.date,
-+    amount: legacy.amount,
-+    payee: legacy.payee_name,
-+    memo: legacy.memo ?? null,
-+    categoryName: legacy.category_name,
-+    cleared: legacy.cleared,
-+    approved: legacy.approved,
-+  };
-+}
- 
--  if (normalizedMatch(bankTxn.payee, ynabTxn.payee_name)) {
--    score += 20;
--    reasons.push('Payee exact match');
--  } else if (payeeScore >= 95) {
--    score += 15;
--    reasons.push(`Payee highly similar (${Math.round(payeeScore)}%)`);
--  } else if (payeeScore >= 80) {
--    score += 10;
--    reasons.push(`Payee similar (${Math.round(payeeScore)}%)`);
--  } else if (payeeScore >= 60) {
--    score += 6;
--    reasons.push(`Payee somewhat similar (${Math.round(payeeScore)}%)`);
-+function mapToLegacyBankTransaction(canonical: CanonicalBankTransaction): LegacyBankTransaction {
-+  return {
-+    id: canonical.id,
-+    date: canonical.date,
-+    amount: canonical.amount / 1000,
-+    payee: canonical.payee,
-+    ...(canonical.memo && { memo: canonical.memo }),
-+    original_csv_row: canonical.sourceRow,
-+  };
-+}
-+
-+function mapToLegacyYNABTransaction(canonical: NormalizedYNABTransaction): LegacyYNABTransaction {
-+  return {
-+    id: canonical.id,
-+    date: canonical.date,
-+    amount: canonical.amount,
-+    payee_name: canonical.payee,
-+    category_name: canonical.categoryName,
-+    cleared: canonical.cleared,
-+    approved: canonical.approved,
-+    ...(canonical.memo !== null && { memo: canonical.memo }),
-+  };
-+}
-+
-+function mapToLegacyTransactionMatch(result: MatchResult): LegacyTransactionMatch {
-+  const bankTransaction = mapToLegacyBankTransaction(result.bankTransaction);
-+  const ynabTransaction = result.bestMatch
-+    ? mapToLegacyYNABTransaction(result.bestMatch.ynabTransaction)
-+    : undefined;
-+
-+  const candidates: LegacyMatchCandidate[] = result.candidates.map((c) => ({
-+    ynab_transaction: mapToLegacyYNABTransaction(c.ynabTransaction),
-+    confidence: c.scores.combined,
-+    match_reason: c.matchReasons.join(', '),
-+    explanation: `Score: ${c.scores.combined}. ${c.matchReasons.join(', ')}`,
-+  }));
-+
-+  const topCandidate = result.candidates[0];
-+
-+  let actionHint: string | undefined;
-+  switch (result.confidence) {
-+    case 'high':
-+      actionHint = 'approve';
-+      break;
-+    case 'medium':
-+    case 'low':
-+      actionHint = 'review';
-+      break;
-+    case 'none':
-+      actionHint = 'add_to_ynab';
-+      break;
-   }
- 
--  return { score: Math.round(score), reasons };
-+  return {
-+    bank_transaction: bankTransaction,
-+    ...(ynabTransaction && { ynab_transaction: ynabTransaction }),
-+    ...(candidates.length > 0 && { candidates }),
-+    confidence: result.confidence,
-+    confidence_score: result.confidenceScore,
-+    match_reason: result.bestMatch?.matchReasons.join(', ') ?? 'No match found',
-+    ...(topCandidate && { top_confidence: topCandidate.scores.combined }),
-+    ...(actionHint && { action_hint: actionHint }),
-+    ...(result.confidence === 'none' && {
-+      recommendation: 'This bank transaction is not in YNAB. Consider adding it.',
-+    }),
-+  };
- }
- 
--/**
-- * Priority scoring for YNAB transactions
-- * Uncleared transactions get higher priority than cleared ones
-- */
--function getPriority(ynabTxn: YNABTransaction): number {
--  // Uncleared transactions are expecting bank confirmation
--  if (ynabTxn.cleared === 'uncleared') return 10;
--  if (ynabTxn.cleared === 'cleared') return 5;
--  if (ynabTxn.cleared === 'reconciled') return 1;
--  return 0;
-+function matchSingle(
-+  bankTxnInput: CanonicalBankTransaction | LegacyBankTransaction,
-+  ynabTransactionsInput: (NormalizedYNABTransaction | LegacyYNABTransaction)[],
-+  usedIds: Set<string>,
-+  configInput: AnyMatchingConfig,
-+): MatchResult {
-+  const bankTxn = toCanonicalBankTransaction(bankTxnInput);
-+  const ynabTransactions = ynabTransactionsInput.map(toCanonicalYNABTransaction);
-+  const config = normalizeConfig(configInput);
-+
-+  const candidates = findCandidates(bankTxn, ynabTransactions, usedIds, config);
-+
-+  const bestMatch = candidates.length > 0 ? candidates[0]! : null;
-+  const confidenceScore = bestMatch?.scores.combined ?? 0;
-+
-+  let confidence: MatchResult['confidence'];
-+  if (confidenceScore >= config.autoMatchThreshold) {
-+    confidence = 'high';
-+    if (bestMatch) usedIds.add(bestMatch.ynabTransaction.id);
-+  } else if (confidenceScore >= config.suggestedMatchThreshold) {
-+    confidence = 'medium';
-+  } else if (confidenceScore >= config.minimumCandidateScore) {
-+    confidence = 'low';
-+  } else {
-+    confidence = 'none';
-+  }
-+
-+  return {
-+    bankTransaction: bankTxn,
-+    bestMatch,
-+    candidates: candidates.slice(0, 3),
-+    confidence,
-+    confidenceScore,
-+  };
- }
- 
--/**
-- * Find all matching candidates for a bank transaction
-- */
--function findMatchCandidates(
--  bankTxn: BankTransaction,
--  ynabTransactions: YNABTransaction[],
-+export function findMatches(
-+  bankTransactions: CanonicalBankTransaction[],
-+  ynabTransactions: NormalizedYNABTransaction[],
-+  config?: MatchingConfig,
-+): MatchResult[];
-+
-+export function findMatches(
-+  bankTransactions: LegacyBankTransaction[],
-+  ynabTransactions: LegacyYNABTransaction[],
-+  config: LegacyMatchingConfig,
-+): LegacyTransactionMatch[];
-+
-+export function findMatches(
-+  bankTransactions: (CanonicalBankTransaction | LegacyBankTransaction)[],
-+  ynabTransactions: (NormalizedYNABTransaction | LegacyYNABTransaction)[],
-+  config?: AnyMatchingConfig,
-+): (MatchResult | LegacyTransactionMatch)[] {
-+  const usedYnabIds = new Set<string>();
-+  const results: MatchResult[] = [];
-+
-+  for (const bankTxn of bankTransactions) {
-+    results.push(matchSingle(bankTxn, ynabTransactions, usedYnabIds, config));
-+  }
-+
-+  // If inputs look legacy, map results back to legacy TransactionMatch
-+  if (bankTransactions.some((txn) => isLegacyBankTransaction(txn))) {
-+    return results.map(mapToLegacyTransactionMatch);
-+  }
-+
-+  return results;
-+}
-+
-+function findCandidates(
-+  bankTxn: CanonicalBankTransaction,
-+  ynabTransactions: NormalizedYNABTransaction[],
-   usedIds: Set<string>,
-   config: MatchingConfig,
- ): MatchCandidate[] {
-   const candidates: MatchCandidate[] = [];
- 
-   for (const ynabTxn of ynabTransactions) {
--    // Skip already matched transactions
-     if (usedIds.has(ynabTxn.id)) continue;
- 
--    // Skip opposite-signed transactions (refunds vs purchases)
--    if (bankTxn.amount > 0 !== ynabTxn.amount > 0) continue;
-+    // Sign check - both must be same sign (or both zero)
-+    const bankSign = Math.sign(bankTxn.amount);
-+    const ynabSign = Math.sign(ynabTxn.amount);
-+    if (bankSign !== ynabSign && bankSign !== 0 && ynabSign !== 0) {
-+      continue;
-+    }
- 
--    // Calculate match score
--    const { score, reasons } = calculateMatchScore(bankTxn, ynabTxn, config);
-+    const amountDiff = Math.abs(bankTxn.amount - ynabTxn.amount);
-+    if (amountDiff > config.amountToleranceMilliunits) {
-+      // Outside configured amount tolerance - treat as no candidate
-+      continue;
-+    }
- 
--    // Only include candidates with minimum score
--    if (score >= 30) {
-+    const scores = calculateScores(bankTxn, ynabTxn, config);
-+
-+    if (scores.combined >= config.minimumCandidateScore) {
-       candidates.push({
--        ynab_transaction: ynabTxn,
--        confidence: score,
--        match_reason: reasons.join(', '),
--        explanation: buildExplanation(bankTxn, ynabTxn, score, reasons),
-+        ynabTransaction: ynabTxn,
-+        scores,
-+        matchReasons: buildMatchReasons(scores, config),
-       });
-     }
-   }
- 
--  // Sort by confidence (desc), then priority (desc), then date proximity
-   candidates.sort((a, b) => {
--    if (b.confidence !== a.confidence) {
--      return b.confidence - a.confidence;
-+    const scoreDiff = b.scores.combined - a.scores.combined;
-+    if (scoreDiff !== 0) {
-+      return scoreDiff;
-+    }
-+
-+    const aUncleared = a.ynabTransaction.cleared === 'uncleared' ? 1 : 0;
-+    const bUncleared = b.ynabTransaction.cleared === 'uncleared' ? 1 : 0;
-+    if (aUncleared !== bUncleared) {
-+      return bUncleared - aUncleared;
-+    }
-+
-+    const bankTime = new Date(bankTxn.date).getTime();
-+    const aDiff = Math.abs(bankTime - new Date(a.ynabTransaction.date).getTime());
-+    const bDiff = Math.abs(bankTime - new Date(b.ynabTransaction.date).getTime());
-+    if (aDiff !== bDiff) {
-+      return aDiff - bDiff;
-     }
--    const priorityDiff = getPriority(b.ynab_transaction) - getPriority(a.ynab_transaction);
--    if (priorityDiff !== 0) return priorityDiff;
--
--    // Date proximity as tiebreaker
--    const dateProximityA = Math.abs(
--      new Date(bankTxn.date).getTime() - new Date(a.ynab_transaction.date).getTime(),
--    );
--    const dateProximityB = Math.abs(
--      new Date(bankTxn.date).getTime() - new Date(b.ynab_transaction.date).getTime(),
--    );
--    return dateProximityA - dateProximityB;
--  });
- 
-+    return 0;
-+  });
-   return candidates;
- }
- 
--/**
-- * Build human-readable explanation for a match
-- */
--function buildExplanation(
--  _bankTxn: BankTransaction,
--  ynabTxn: YNABTransaction,
--  score: number,
--  reasons: string[],
--): string {
--  const parts: string[] = [];
--
--  parts.push(`Match confidence: ${score}%`);
--  parts.push(reasons.join(', '));
--
--  if (ynabTxn.cleared === 'uncleared') {
--    parts.push('(Uncleared - awaiting confirmation)');
-+function calculateScores(
-+  bankTxn: CanonicalBankTransaction,
-+  ynabTxn: NormalizedYNABTransaction,
-+  config: MatchingConfig,
-+): MatchCandidate['scores'] {
-+  // Amount score - now using INTEGER comparison (milliunits)
-+  const amountDiff = Math.abs(bankTxn.amount - ynabTxn.amount);
-+  let amountScore: number;
-+
-+  if (amountDiff === 0) {
-+    // Exact integer match - no floating point issues!
-+    amountScore = 100;
-+  } else if (amountDiff <= config.amountToleranceMilliunits) {
-+    amountScore = 95;
-+  } else if (amountDiff <= 1000) {
-+    // Within $1
-+    amountScore = 80 - (amountDiff / 1000) * 20;
-+  } else {
-+    amountScore = Math.max(0, 60 - (amountDiff / 1000) * 5);
-   }
- 
--  return parts.join(' | ');
-+  // Date score
-+  const bankDate = new Date(bankTxn.date);
-+  const ynabDate = new Date(ynabTxn.date);
-+  const daysDiff = Math.abs(bankDate.getTime() - ynabDate.getTime()) / (1000 * 60 * 60 * 24);
-+  let dateScore: number;
-+
-+  if (daysDiff < 0.5) {
-+    dateScore = 100;
-+  } else if (daysDiff <= 1) {
-+    dateScore = 95;
-+  } else if (daysDiff <= config.dateToleranceDays) {
-+    dateScore = 90 - (daysDiff - 1) * (40 / config.dateToleranceDays);
-+  } else {
-+    dateScore = Math.max(0, 50 - (daysDiff - config.dateToleranceDays) * 5);
-+  }
-+
-+  // Payee score using fuzzball
-+  const payeeScore = calculatePayeeScore(bankTxn.payee, ynabTxn.payee);
-+
-+  // Combined score with weights
-+  let combined =
-+    amountScore * config.weights.amount +
-+    dateScore * config.weights.date +
-+    payeeScore * config.weights.payee;
-+
-+  // Apply bonuses
-+  if (amountScore === 100) combined += config.exactAmountBonus;
-+  if (dateScore === 100) combined += config.exactDateBonus;
-+  if (payeeScore >= 95) combined += config.exactPayeeBonus;
-+
-+  combined = Math.min(100, combined);
-+
-+  return {
-+    amount: Math.round(amountScore),
-+    date: Math.round(dateScore),
-+    payee: Math.round(payeeScore),
-+    combined: Math.round(combined),
-+  };
- }
- 
--/**
-- * Find best match for a single bank transaction
-- */
--export function findBestMatch(
--  bankTxn: BankTransaction,
--  ynabTransactions: YNABTransaction[],
--  usedIds: Set<string>,
--  config: MatchingConfig,
--): TransactionMatch {
--  const candidates = findMatchCandidates(bankTxn, ynabTransactions, usedIds, config);
-+function calculatePayeeScore(bankPayee: string, ynabPayee: string | null): number {
-+  if (!ynabPayee) return 30;
- 
--  if (candidates.length === 0) {
--    // No match found
--    return {
--      bank_transaction: bankTxn,
--      confidence: 'none',
--      confidence_score: 0,
--      match_reason: 'No matching transaction found in YNAB',
--      action_hint: 'add_to_ynab',
--      recommendation: 'This transaction appears on bank statement but not in YNAB',
--    };
--  }
-+  const scores = [
-+    fuzz.token_set_ratio(bankPayee, ynabPayee),
-+    fuzz.token_sort_ratio(bankPayee, ynabPayee),
-+    fuzz.partial_ratio(bankPayee, ynabPayee),
-+    fuzz.WRatio(bankPayee, ynabPayee),
-+  ];
- 
--  const bestCandidate = candidates[0]!; // Safe: we checked candidates.length > 0
--  const bestScore = bestCandidate.confidence;
-+  return Math.max(...scores);
-+}
- 
--  // HIGH confidence: Auto-match candidate (≥90%)
--  if (bestScore >= config.autoMatchThreshold) {
--    return {
--      bank_transaction: bankTxn,
--      ynab_transaction: bestCandidate.ynab_transaction,
--      confidence: 'high',
--      confidence_score: bestScore,
--      match_reason: bestCandidate.match_reason,
--    };
-+function buildMatchReasons(scores: MatchCandidate['scores'], config: MatchingConfig): string[] {
-+  const reasons: string[] = [];
-+
-+  if (scores.amount === 100) {
-+    reasons.push('Exact amount match');
-+  } else if (scores.amount >= 95) {
-+    reasons.push('Amount within tolerance');
-   }
- 
--  // MEDIUM confidence: Suggested match (60-89%)
--  if (bestScore >= config.suggestionThreshold) {
--    return {
--      bank_transaction: bankTxn,
--      ynab_transaction: bestCandidate.ynab_transaction,
--      candidates: candidates.slice(0, 3), // Top 3 candidates
--      confidence: 'medium',
--      confidence_score: bestScore,
--      match_reason: bestCandidate.match_reason,
--      top_confidence: bestScore,
--      action_hint: 'review_and_choose',
--    };
-+  if (scores.date === 100) {
-+    reasons.push('Same date');
-+  } else if (scores.date >= 90) {
-+    reasons.push('Date within 1-2 days');
-+  } else if (scores.date >= 50) {
-+    reasons.push(`Date within ${config.dateToleranceDays} days`);
-   }
- 
--  // LOW confidence: Show as possible match but don't auto-suggest (30-59%)
--  return {
--    bank_transaction: bankTxn,
--    candidates: candidates.slice(0, 3),
--    confidence: 'low',
--    confidence_score: bestScore,
--    match_reason: 'Low confidence match',
--    top_confidence: bestScore,
--    action_hint: 'review_or_add_new',
--    recommendation: 'Consider reviewing candidates or adding as new transaction',
--  };
-+  if (scores.payee >= 95) {
-+    reasons.push('Payee exact match');
-+  } else if (scores.payee >= 80) {
-+    reasons.push('Payee highly similar');
-+  } else if (scores.payee >= 60) {
-+    reasons.push('Payee somewhat similar');
-+  }
-+
-+  return reasons;
- }
- 
--/**
-- * Find matches for all bank transactions
-- */
--export function findMatches(
--  bankTransactions: BankTransaction[],
--  ynabTransactions: YNABTransaction[],
--  config: MatchingConfig = DEFAULT_MATCHING_CONFIG as MatchingConfig,
--): TransactionMatch[] {
--  const matches: TransactionMatch[] = [];
--  const usedIds = new Set<string>();
-+export function findBestMatch(
-+  bankTransaction: CanonicalBankTransaction,
-+  ynabTransactions: NormalizedYNABTransaction[],
-+  usedYnabIds?: Set<string>,
-+  config?: MatchingConfig,
-+): MatchResult;
- 
--  for (const bankTxn of bankTransactions) {
--    const match = findBestMatch(bankTxn, ynabTransactions, usedIds, config);
--    matches.push(match);
-+export function findBestMatch(
-+  bankTransaction: LegacyBankTransaction,
-+  ynabTransactions: LegacyYNABTransaction[],
-+  usedYnabIds: Set<string>,
-+  config: LegacyMatchingConfig,
-+): LegacyTransactionMatch;
- 
--    // Mark high-confidence matches as used to prevent duplicate matching
--    if (match.confidence === 'high' && match.ynab_transaction) {
--      usedIds.add(match.ynab_transaction.id);
--    }
-+export function findBestMatch(
-+  bankTransaction: CanonicalBankTransaction | LegacyBankTransaction,
-+  ynabTransactions: NormalizedYNABTransaction[] | LegacyYNABTransaction[],
-+  usedYnabIds: Set<string> = new Set<string>(),
-+  config?: AnyMatchingConfig,
-+): MatchResult | LegacyTransactionMatch {
-+  const result = matchSingle(bankTransaction, ynabTransactions, usedYnabIds, config);
-+
-+  if (isLegacyBankTransaction(bankTransaction)) {
-+    return mapToLegacyTransactionMatch(result);
-   }
- 
--  return matches;
-+  return result;
- }