@fuzzle/opencode-accountant 0.7.4 → 0.8.0-next.1

package/README.md

@@ -261,7 +261,7 @@ See the hledger documentation for details on rules file format and syntax.
 The pipeline automatically manages account declarations:
 
 - Scans rules files matched to the CSVs being imported
-- Extracts all accounts (account1 and account2 directives)
+- Extracts all accounts (account1, account2, account3, etc. directives)
 - Creates or updates year journal files with sorted account declarations
 - Ensures `hledger check --strict` validation passes
 

package/agent/accountant.md

@@ -148,7 +148,7 @@ The `import-pipeline` tool operates directly on the working directory:
 
 The import pipeline automatically:
 
-- Scans matched rules files for all account references (account1, account2 directives)
+- Scans matched rules files for all account references (account1, account2, account3, etc. directives)
 - Creates/updates year journal files (e.g., ledger/2026.journal) with sorted account declarations
 - Prevents `hledger check --strict` failures due to missing account declarations
 - No manual account setup required

package/dist/index.js

@@ -4249,7 +4249,7 @@ __export(exports_accountSuggester, {
   extractRulePatternsFromFile: () => extractRulePatternsFromFile,
   clearSuggestionCache: () => clearSuggestionCache
 });
-import * as fs16 from "fs";
+import * as fs17 from "fs";
 import * as crypto from "crypto";
 function clearSuggestionCache() {
   Object.keys(suggestionCache).forEach((key) => delete suggestionCache[key]);
@@ -4259,10 +4259,10 @@ function hashTransaction(posting) {
   return crypto.createHash("md5").update(data).digest("hex");
 }
 function loadExistingAccounts(yearJournalPath) {
-  if (!fs16.existsSync(yearJournalPath)) {
+  if (!fs17.existsSync(yearJournalPath)) {
     return [];
   }
-  const content = fs16.readFileSync(yearJournalPath, "utf-8");
+  const content = fs17.readFileSync(yearJournalPath, "utf-8");
   const lines = content.split(`
 `);
   const accounts = [];
@@ -4278,10 +4278,10 @@ function loadExistingAccounts(yearJournalPath) {
   return accounts.sort();
 }
 function extractRulePatternsFromFile(rulesPath) {
-  if (!fs16.existsSync(rulesPath)) {
+  if (!fs17.existsSync(rulesPath)) {
     return [];
   }
-  const content = fs16.readFileSync(rulesPath, "utf-8");
+  const content = fs17.readFileSync(rulesPath, "utf-8");
   const lines = content.split(`
 `);
   const patterns = [];
@@ -24098,15 +24098,11 @@ function extractAccountsFromRulesFile(rulesPath) {
     if (trimmed.startsWith("#") || trimmed.startsWith(";") || trimmed === "") {
       continue;
     }
-    const account1Match = trimmed.match(/^account1\s+(.+?)(?:\s+|$)/);
-    if (account1Match) {
-      accounts.add(account1Match[1].trim());
+    const accountMatch = trimmed.match(/^account\d+\s+(.+?)(?:\s+|$)/);
+    if (accountMatch) {
+      accounts.add(accountMatch[1].trim());
       continue;
     }
-    const account2Match = trimmed.match(/account2\s+(.+?)(?:\s+|$)/);
-    if (account2Match) {
-      accounts.add(account2Match[1].trim());
-    }
   }
   return accounts;
 }
@@ -24736,6 +24732,54 @@ Got:
   return { rowsProcessed, sendRowsEnriched, alreadyPreprocessed: false };
 }
 
+// src/utils/revolutFiatCsvPreprocessor.ts
+import * as fs16 from "fs";
+var ORIGINAL_HEADER2 = "Type,Product,Started Date,Completed Date,Description,Amount,Fee,Currency,State,Balance";
+var PREPROCESSED_HEADER2 = "Type,Product,Started Date,Completed Date,Description,Amount,Fee,Currency,State,Balance,Net_Amount";
+function preprocessRevolutFiatCsv(csvPath, logger) {
+  const content = fs16.readFileSync(csvPath, "utf-8");
+  const lines = content.trim().split(`
+`);
+  if (lines.length < 2) {
+    return { rowsProcessed: 0, sendRowsEnriched: 0, alreadyPreprocessed: false };
+  }
+  const header = lines[0].trim();
+  if (header === PREPROCESSED_HEADER2) {
+    logger?.info("CSV already preprocessed, skipping");
+    return { rowsProcessed: lines.length - 1, sendRowsEnriched: 0, alreadyPreprocessed: true };
+  }
+  if (header !== ORIGINAL_HEADER2) {
+    throw new Error(`Unexpected CSV header. Expected:
+  ${ORIGINAL_HEADER2}
+Got:
+  ${header}`);
+  }
+  const outputLines = [PREPROCESSED_HEADER2];
+  let enrichedRows = 0;
+  for (let i2 = 1;i2 < lines.length; i2++) {
+    const line = lines[i2];
+    if (line.trim() === "")
+      continue;
+    const fields = line.split(",");
+    if (fields.length < 7) {
+      outputLines.push(line + ",");
+      continue;
+    }
+    const amount = parseFloat(fields[5]);
+    const fee = parseFloat(fields[6]);
+    const netAmount = amount - fee;
+    outputLines.push(`${line},${netAmount.toFixed(2)}`);
+    enrichedRows++;
+  }
+  const outputContent = outputLines.join(`
+`) + `
+`;
+  fs16.writeFileSync(csvPath, outputContent);
+  const rowsProcessed = outputLines.length - 1;
+  logger?.info(`Preprocessed ${rowsProcessed} rows (${enrichedRows} rows enriched with Net_Amount)`);
+  return { rowsProcessed, sendRowsEnriched: enrichedRows, alreadyPreprocessed: false };
+}
+
 // src/tools/import-pipeline.ts
 class NoTransactionsError extends Error {
   constructor() {
@@ -24803,6 +24847,50 @@ async function executeClassifyStep(context, logger) {
   logger?.endSection();
   return contextIds;
 }
+function executePreprocessFiatStep(context, contextIds, logger) {
+  const fiatCsvPaths = [];
+  for (const contextId of contextIds) {
+    const importCtx = loadContext(context.directory, contextId);
+    if (importCtx.provider === "revolut" && importCtx.currency !== "btc") {
+      fiatCsvPaths.push(path12.join(context.directory, importCtx.filePath));
+    }
+  }
+  if (fiatCsvPaths.length === 0) {
+    logger?.info("No revolut fiat CSV found, skipping fiat preprocessing");
+    return;
+  }
+  logger?.startSection("Step 1a: Preprocess Fiat CSV");
+  logger?.logStep("Fiat Preprocess", "start");
+  try {
+    let totalRows = 0;
+    let totalEnriched = 0;
+    let anyPreprocessed = true;
+    for (const csvPath of fiatCsvPaths) {
+      const result = preprocessRevolutFiatCsv(csvPath, logger);
+      totalRows += result.rowsProcessed;
+      totalEnriched += result.sendRowsEnriched;
+      if (!result.alreadyPreprocessed)
+        anyPreprocessed = false;
+    }
+    const message = anyPreprocessed && fiatCsvPaths.length > 0 && totalEnriched === 0 ? "Fiat CSV(s) already preprocessed" : `Preprocessed ${totalRows} rows (${totalEnriched} enriched with Net_Amount)`;
+    logger?.logStep("Fiat Preprocess", "success", message);
+    context.result.steps.fiatPreprocess = buildStepResult(true, message, {
+      rowsProcessed: totalRows,
+      enrichedRows: totalEnriched,
+      alreadyPreprocessed: anyPreprocessed && fiatCsvPaths.length > 0
+    });
+  } catch (error45) {
+    const errorMessage = `Fiat CSV preprocessing failed: ${error45 instanceof Error ? error45.message : String(error45)}`;
+    logger?.error(errorMessage);
+    logger?.logStep("Fiat Preprocess", "error", errorMessage);
+    context.result.steps.fiatPreprocess = buildStepResult(false, errorMessage);
+    context.result.error = errorMessage;
+    context.result.hint = "Check the fiat CSV format \u2014 expected Revolut account statement";
+    throw new Error(errorMessage);
+  } finally {
+    logger?.endSection();
+  }
+}
 function executePreprocessBtcStep(context, contextIds, logger) {
   let btcCsvPath;
   for (const contextId of contextIds) {
@@ -25163,10 +25251,18 @@ async function importPipeline(directory, agent, options, configLoader = loadImpo
       logger.info("No files classified, nothing to import");
       return buildPipelineSuccessResult(result, "No files to import");
     }
+    executePreprocessFiatStep(context, contextIds, logger);
     executePreprocessBtcStep(context, contextIds, logger);
     await executeBtcPurchaseStep(context, contextIds, logger);
+    const orderedContextIds = [...contextIds].sort((a, b) => {
+      const ctxA = loadContext(context.directory, a);
+      const ctxB = loadContext(context.directory, b);
+      const isBtcA = ctxA.provider === "revolut" && ctxA.currency === "btc" ? 1 : 0;
+      const isBtcB = ctxB.provider === "revolut" && ctxB.currency === "btc" ? 1 : 0;
+      return isBtcA - isBtcB;
+    });
     let totalTransactions = 0;
-    for (const contextId of contextIds) {
+    for (const contextId of orderedContextIds) {
       const importContext = loadContext(context.directory, contextId);
       logger.info(`Processing: ${importContext.filename} (${importContext.accountNumber || "unknown account"})`);
       try {
@@ -25251,7 +25347,7 @@ This tool orchestrates the full import workflow:
   }
 });
 // src/tools/init-directories.ts
-import * as fs17 from "fs";
+import * as fs18 from "fs";
 import * as path13 from "path";
 async function initDirectories(directory) {
   try {
@@ -25259,8 +25355,8 @@ async function initDirectories(directory) {
     const directoriesCreated = [];
     const gitkeepFiles = [];
     const importBase = path13.join(directory, "import");
-    if (!fs17.existsSync(importBase)) {
-      fs17.mkdirSync(importBase, { recursive: true });
+    if (!fs18.existsSync(importBase)) {
+      fs18.mkdirSync(importBase, { recursive: true });
       directoriesCreated.push("import");
     }
     const pathsToCreate = [
@@ -25271,19 +25367,19 @@ async function initDirectories(directory) {
     ];
     for (const { path: dirPath } of pathsToCreate) {
       const fullPath = path13.join(directory, dirPath);
-      if (!fs17.existsSync(fullPath)) {
-        fs17.mkdirSync(fullPath, { recursive: true });
+      if (!fs18.existsSync(fullPath)) {
+        fs18.mkdirSync(fullPath, { recursive: true });
         directoriesCreated.push(dirPath);
       }
       const gitkeepPath = path13.join(fullPath, ".gitkeep");
-      if (!fs17.existsSync(gitkeepPath)) {
-        fs17.writeFileSync(gitkeepPath, "");
+      if (!fs18.existsSync(gitkeepPath)) {
+        fs18.writeFileSync(gitkeepPath, "");
         gitkeepFiles.push(path13.join(dirPath, ".gitkeep"));
       }
     }
     const gitignorePath = path13.join(importBase, ".gitignore");
     let gitignoreCreated = false;
-    if (!fs17.existsSync(gitignorePath)) {
+    if (!fs18.existsSync(gitignorePath)) {
       const gitignoreContent = `# Ignore CSV/PDF files in temporary directories
 /incoming/*.csv
 /incoming/*.pdf
@@ -25301,7 +25397,7 @@ async function initDirectories(directory) {
 .DS_Store
 Thumbs.db
 `;
-      fs17.writeFileSync(gitignorePath, gitignoreContent);
+      fs18.writeFileSync(gitignorePath, gitignoreContent);
       gitignoreCreated = true;
     }
     const parts = [];
@@ -25378,13 +25474,13 @@ You can now drop CSV files into import/incoming/ and run import-pipeline.`);
 });
 // src/tools/generate-btc-purchases.ts
 import * as path14 from "path";
-import * as fs18 from "fs";
+import * as fs19 from "fs";
 function findFiatCsvPaths(directory, pendingDir, provider) {
   const providerDir = path14.join(directory, pendingDir, provider);
-  if (!fs18.existsSync(providerDir))
+  if (!fs19.existsSync(providerDir))
     return [];
   const csvPaths = [];
-  const entries = fs18.readdirSync(providerDir, { withFileTypes: true });
+  const entries = fs19.readdirSync(providerDir, { withFileTypes: true });
   for (const entry of entries) {
     if (!entry.isDirectory())
       continue;

package/docs/tools/import-pipeline.md

@@ -9,13 +9,14 @@ This tool is **restricted to the accountant agent only**.
 The pipeline automates these sequential steps:
 
 1. **Classify** - Detect provider/currency, create contexts, organize files
-1a. **Preprocess BTC CSV** _(Revolut only)_ - Add computed columns (fees in BTC, total, clean price) for hledger rules
-1b. **Generate BTC Purchases** _(Revolut only)_ - Cross-reference fiat + BTC CSVs for equity conversion entries
+1a. **Preprocess Fiat CSV** _(Revolut only)_ - Add computed `Net_Amount` column (`Amount - Fee`) for hledger rules
+1b. **Preprocess BTC CSV** _(Revolut only)_ - Add computed columns (fees in BTC, total, clean price) for hledger rules
+1c. **Generate BTC Purchases** _(Revolut only)_ - Cross-reference fiat + BTC CSVs for equity conversion entries
 2. **Account Declarations** - Ensure all accounts exist in year journals
 3. **Import** - Validate transactions, add to journals, move files to done
 4. **Reconcile** - Verify balances match expectations
 
-Steps 1a and 1b are Revolut-specific and are automatically skipped when no Revolut BTC CSV is present.
+Steps 1a–1c are Revolut-specific and are automatically skipped when no matching Revolut CSVs are present.
 
 **Key behavior**: The pipeline processes files via **import contexts**. Each classified CSV gets a unique context ID, and subsequent steps operate on these contexts **sequentially** with **fail-fast** error handling.
 
@@ -154,7 +155,24 @@ When reconciliation fails:
 
 See [classify-statements](classify-statements.md) for details.
 
-### Step 1a: Preprocess BTC CSV
+### Step 1a: Preprocess Fiat CSV
+
+**Purpose**: Add a computed `Net_Amount` column to Revolut fiat CSVs for use in hledger rules
+
+**What happens**:
+
+1. Finds Revolut fiat contexts (provider=revolut, currency≠btc) from classification
+2. For each row, computes: `Net_Amount = Amount - Fee` (formatted to 2 decimal places)
+3. Appends `Net_Amount` column to the CSV (in-place)
+4. Idempotent — skips if CSV is already preprocessed
+
+**Why**: Revolut fiat CSVs have a separate `Fee` column (e.g., weekend FX surcharge). The total bank deduction is `Amount - Fee`, but this value isn't in the CSV. hledger rules can't perform arithmetic, so the preprocessor computes it as a new column that rules can reference via `%net_amount`.
+
+**Example**: Amount=`-45.32`, Fee=`0.45` → Net_Amount=`-45.77`
+
+**Skipped when**: No Revolut fiat CSV is present among the classified files.
+
+### Step 1b: Preprocess BTC CSV
 
 **Purpose**: Add computed columns to Revolut BTC CSVs for use in hledger rules
 
@@ -169,7 +187,7 @@ See [classify-statements](classify-statements.md) for details.
 
 **Skipped when**: No Revolut BTC CSV is present among the classified files.
 
-### Step 1b: Generate BTC Purchase Entries
+### Step 1c: Generate BTC Purchase Entries
 
 **Purpose**: Cross-reference Revolut fiat and BTC CSVs to generate equity conversion journal entries for BTC purchases
 
@@ -255,37 +273,43 @@ See [reconcile-statement](reconcile-statement.md) for details.
 ### Visual Flow
 
 ```
-┌────────────────────────────────────────────────────────────────┐
-│  USER: Drop CSV files into import/incoming/                   │
-└────────────────────────────────────────────────────────────────┘
+┌──────────────────────────────────────────────────────────────┐
+│  USER: Drop CSV files into import/incoming/                  │
+└──────────────────────────────────────────────────────────────┘
+                            │
+                            ▼
+┌──────────────────────────────────────────────────────────────┐
+│  STEP 1: classify-statements                                 │
+│  ┌────────────────────────────────────────────────────────┐  │
+│  │ For each CSV:                                          │  │
+│  │  • Detect provider/currency                            │  │
+│  │  • Extract metadata (account#, dates, balances)        │  │
+│  │  • Generate UUID                                       │  │
+│  │  • CREATE: .memory/{uuid}.json                         │  │
+│  │  • Move: incoming/ → pending/{provider}/{currency}/    │  │
+│  └────────────────────────────────────────────────────────┘  │
+│                                                              │
+│  OUTPUT: ["uuid-1", "uuid-2"]                                │
+└──────────────────────────────────────────────────────────────┘
                             │
                             ▼
-┌────────────────────────────────────────────────────────────────┐
-│  STEP 1: classify-statements                                   │
-│  ┌──────────────────────────────────────────────────────────┐ │
-│  │ For each CSV:                                            │ │
-│  │  • Detect provider/currency                              │ │
-│  │  • Extract metadata (account#, dates, balances)          │ │
-│  │  • Generate UUID                                         │ │
-│  │  • CREATE: .memory/{uuid}.json                          │ │
-│  │  • Move: incoming/ → pending/{provider}/{currency}/     │ │
-│  └──────────────────────────────────────────────────────────┘ │
-│                                                                 │
-│  OUTPUT: ["uuid-1", "uuid-2"]                                 │
-└────────────────────────────────────────────────────────────────┘
+┌──────────────────────────────────────────────────────────────┐
+│  STEP 1a: Preprocess Fiat CSV (if revolut fiat context)      │
+│  • Add Net_Amount column (Amount - Fee)                      │
+└──────────────────────────────────────────────────────────────┘
                             │
                             ▼
-┌────────────────────────────────────────────────────────────────┐
-│  STEP 1a: Preprocess BTC CSV (if revolut/btc context exists)  │
-│  • Add Fees_BTC, Total_BTC, Price_Amount columns              │
-└────────────────────────────────────────────────────────────────┘
+┌──────────────────────────────────────────────────────────────┐
+│  STEP 1b: Preprocess BTC CSV (if revolut/btc context)        │
+│  • Add Fees_BTC, Total_BTC, Price_Amount columns             │
+└──────────────────────────────────────────────────────────────┘
                             │
                             ▼
-┌────────────────────────────────────────────────────────────────┐
-│  STEP 1b: Generate BTC Purchase Entries                        │
-│  • Cross-reference fiat + BTC CSVs                             │
-│  • Generate equity conversion journal entries                  │
-└────────────────────────────────────────────────────────────────┘
+┌──────────────────────────────────────────────────────────────┐
+│  STEP 1c: Generate BTC Purchase Entries                      │
+│  • Cross-reference fiat + BTC CSVs                           │
+│  • Generate equity conversion journal entries                │
+└──────────────────────────────────────────────────────────────┘
                             │
                             ▼
         ┌───────────────────┴───────────────────┐
@@ -297,24 +321,23 @@ See [reconcile-statement](reconcile-statement.md) for details.
   └──────────┘                          └──────────┘
         │                                       │
         ▼                                       │
-┌────────────────────────────────────────┐      │
-│ STEPS 2-4 (for uuid-1):                │      │
-│  • Account Declarations                 │      │
-│  • Dry Run                              │      │
-│  • Import                               │      │
-│  • Reconcile                            │      │
-│  • UPDATE: .memory/uuid-1.json         │      │
-└────────────────────────────────────────┘      │
-        │ ✓ Success                              │
+┌──────────────────────────────────────┐        │
+│ STEPS 2-4 (for uuid-1):              │        │
+│  • Account Declarations              │        │
+│  • Import                            │        │
+│  • Reconcile                         │        │
+│  • UPDATE: .memory/uuid-1.json       │        │
+└──────────────────────────────────────┘        │
+        │ ✓ Success                             │
         │                                       │
         │                                       ▼
-        │                          ┌────────────────────────────────────────┐
-        │                          │ STEPS 2-4 (for uuid-2):                │
-        │                          │  • Account Declarations                 │
-        │                                  │                          │  • Import                               │
-        │                          │  • Reconcile                            │
-        │                          │  • UPDATE: .memory/uuid-2.json         │
-        │                          └────────────────────────────────────────┘
+        │              ┌──────────────────────────────────────┐
+        │              │ STEPS 2-4 (for uuid-2):              │
+        │              │  • Account Declarations              │
+        │              │  • Import                            │
+        │              │  • Reconcile                         │
+        │              │  • UPDATE: .memory/uuid-2.json       │
+        │              └──────────────────────────────────────┘
         │                                       │ ✓ Success
         │                                       │
         ▼                                       ▼

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fuzzle/opencode-accountant",
-  "version": "0.7.4",
+  "version": "0.8.0-next.1",
   "description": "An OpenCode accounting agent, specialized in double-entry-bookkepping with hledger",
   "author": {
     "name": "ali bengali",