@fuzzle/opencode-accountant 0.16.0 → 0.16.1-next.1

package/dist/index.js

@@ -23515,7 +23515,8 @@ function balancesMatch(balance1, balance2) {
     return false;
   }
   validateCurrencies(parsed1, parsed2);
-  return parsed1.amount === parsed2.amount;
+  const round2 = (n) => Math.round(n * 100) / 100;
+  return round2(parsed1.amount) === round2(parsed2.amount);
 }
 
 // src/utils/csvParser.ts
@@ -24035,7 +24036,7 @@ function buildRetryCommand(contextId, closingBalance, account) {
   }
   return parts.join(" ");
 }
-function determineAccount(csvFile, rulesDir, importContext, manualAccount, relativeCsvPath, metadata) {
+function determineAccount(csvFile, rulesDir, directory, importContext, manualAccount, relativeCsvPath, metadata) {
   let account = manualAccount;
   const rulesMapping = loadRulesMapping(rulesDir);
   const rulesFile = findRulesForCsv(csvFile, rulesMapping);
@@ -24043,6 +24044,12 @@ function determineAccount(csvFile, rulesDir, importContext, manualAccount, relat
     if (rulesFile) {
       account = getAccountFromRulesFile(rulesFile) ?? undefined;
     }
+    if (!account && importContext.rulesFile) {
+      const contextRulesPath = path10.join(directory, importContext.rulesFile);
+      if (fs11.existsSync(contextRulesPath)) {
+        account = getAccountFromRulesFile(contextRulesPath) ?? undefined;
+      }
+    }
   }
   if (!account) {
     const rulesHint = rulesFile ? `Add 'account1 assets:bank:...' to ${rulesFile} or retry with: ${buildRetryCommand(importContext.id, undefined, "assets:bank:...")}` : `Create a rules file in ${rulesDir} with 'account1' directive or retry with: ${buildRetryCommand(importContext.id, undefined, "assets:bank:...")}`;
@@ -24160,7 +24167,7 @@ async function reconcileStatement(directory, agent, options, configLoader = load
     return balanceResult.error;
   }
   const { closingBalance, metadata, fromCSVAnalysis } = balanceResult;
-  const accountResult = determineAccount(csvFile, rulesDir, importContext, options.account, relativeCsvPath, metadata);
+  const accountResult = determineAccount(csvFile, rulesDir, directory, importContext, options.account, relativeCsvPath, metadata);
   if ("error" in accountResult) {
     return accountResult.error;
   }
@@ -26962,6 +26969,34 @@ function generateIbkrAdjustmentEntry(adjustment, logger) {
 `;
   return entry;
 }
+function generateIbkrForexEntry(entry, logger) {
+  const description = escapeDescription(entry.description);
+  logger?.debug(`Generating IBKR Forex entry: ${entry.amount} ${entry.currency}`);
+  const postings = [
+    {
+      account: `assets:broker:ibkr:${entry.currency.toLowerCase()}`,
+      amount: formatAmount(entry.amount, entry.currency)
+    }
+  ];
+  if (entry.amount < 0) {
+    postings.push({
+      account: "expenses:fees:forex:ibkr",
+      amount: formatAmount(Math.abs(entry.amount), entry.currency)
+    });
+  } else {
+    postings.push({
+      account: "income:fx-gains:ibkr",
+      amount: formatAmount(-entry.amount, entry.currency)
+    });
+  }
+  let result = `${entry.date} ${description}
+`;
+  result += `    ; ibkr:account:${entry.account}
+`;
+  result += formatPostings(postings) + `
+`;
+  return result;
+}
 
 // src/utils/ibkrCsvPreprocessor.ts
 var TRADE_TYPES2 = new Set(["Buy", "Sell"]);
@@ -27058,7 +27093,7 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
         trades: 0,
         dividends: 0,
         adjustments: 0,
-        skippedForex: 0
+        forex: 0
       },
       alreadyPreprocessed: true
     };
@@ -27070,7 +27105,7 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
   const trades = [];
   const dividendTxns = [];
   const adjustments = [];
-  let skippedForex = 0;
+  const forexTxns = [];
   for (const txn of transactions) {
     if (TRADE_TYPES2.has(txn.transactionType)) {
       trades.push(txn);
@@ -27081,7 +27116,7 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
     } else if (txn.transactionType === DEPOSIT_TYPE) {
       deposits.push(txn);
     } else if (txn.transactionType === FOREX_TYPE) {
-      skippedForex++;
+      forexTxns.push(txn);
     } else {
       logger?.warn(`Unknown IBKR transaction type: ${txn.transactionType}`);
     }
@@ -27167,10 +27202,41 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
       usedAccounts.add("income:fx-gains:ibkr");
     }
   }
+  if (forexTxns.length > 0) {
+    const forexByDate = new Map;
+    for (const txn of forexTxns) {
+      const existing = forexByDate.get(txn.date);
+      if (existing) {
+        existing.total += txn.netAmount;
+      } else {
+        forexByDate.set(txn.date, { account: txn.account, total: txn.netAmount });
+      }
+    }
+    const sortedDates = [...forexByDate.keys()].sort();
+    for (const date5 of sortedDates) {
+      const { account, total } = forexByDate.get(date5);
+      const amount = Math.round(total * 100) / 100;
+      if (amount === 0)
+        continue;
+      const forexEntry = {
+        date: date5,
+        account,
+        description: "Forex conversion cost",
+        amount,
+        currency: currency.toUpperCase()
+      };
+      journalEntries.push(generateIbkrForexEntry(forexEntry, logger));
+      usedAccounts.add(`assets:broker:ibkr:${currency}`);
+      if (amount < 0) {
+        usedAccounts.add("expenses:fees:forex:ibkr");
+      } else {
+        usedAccounts.add("income:fx-gains:ibkr");
+      }
+    }
+  }
   saveLotInventory(directory, lotInventoryPath, inventory, logger);
   let journalFilePath = null;
   if (journalEntries.length > 0) {
-    const yearJournalPath = ensureYearJournalExists(directory, year);
     const header = `; IBKR ${currency.toUpperCase()} investment transactions for ${year}
 ; Generated by opencode-accountant
 ; This file is auto-generated - do not edit manually`;
@@ -27181,13 +27247,6 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
     }
     fs22.writeFileSync(journalPath, journalContent);
     journalFilePath = journalPath;
-    const yearJournalContent = fs22.readFileSync(yearJournalPath, "utf-8");
-    const includeDirective = `include investments/${path17.basename(journalPath)}`;
-    if (!yearJournalContent.includes(includeDirective)) {
-      fs22.writeFileSync(yearJournalPath, yearJournalContent.trimEnd() + `
-` + includeDirective + `
-`);
-    }
     if (tradedSymbols.size > 0) {
       const commodityJournalPath = path17.join(directory, "ledger", "investments", "commodities.journal");
       ensureCommodityDeclarations(commodityJournalPath, tradedSymbols, logger);
@@ -27232,7 +27291,7 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
       trades: trades.length,
       dividends: dividendCount,
       adjustments: adjustments.length,
-      skippedForex
+      forex: forexTxns.length
     },
     alreadyPreprocessed: false
   };
@@ -27611,7 +27670,7 @@ async function executeIbkrPreprocessStep(context, contextIds, logger) {
       trades: 0,
       dividends: 0,
       adjustments: 0,
-      skippedForex: 0
+      forex: 0
     };
     let lastJournalFile = null;
     ibkrContexts.sort((a, b) => {
@@ -27627,7 +27686,7 @@ async function executeIbkrPreprocessStep(context, contextIds, logger) {
       totalStats.trades += result.stats.trades;
       totalStats.dividends += result.stats.dividends;
       totalStats.adjustments += result.stats.adjustments;
-      totalStats.skippedForex += result.stats.skippedForex;
+      totalStats.forex += result.stats.forex;
       if (result.journalFile) {
         lastJournalFile = result.journalFile;
       }
@@ -27637,9 +27696,9 @@ async function executeIbkrPreprocessStep(context, contextIds, logger) {
         });
         logger?.info(`Updated context ${ibkrCtx.contextId} to use filtered CSV: ${path18.basename(result.simpleTransactionsCsv)}`);
       }
-      logger?.logStep("IBKR Preprocess", "success", `Processed: ${result.stats.trades} trades, ${result.stats.dividends} dividends, ${result.stats.adjustments} adjustments, ${result.stats.skippedForex} forex skipped`);
+      logger?.logStep("IBKR Preprocess", "success", `Processed: ${result.stats.trades} trades, ${result.stats.dividends} dividends, ${result.stats.adjustments} adjustments, ${result.stats.forex} forex`);
     }
-    const message = `Preprocessed ${totalStats.totalRows} rows: ${totalStats.trades} trades, ${totalStats.dividends} dividends, ${totalStats.adjustments} adjustments, ${totalStats.deposits} deposits, ${totalStats.skippedForex} forex skipped`;
+    const message = `Preprocessed ${totalStats.totalRows} rows: ${totalStats.trades} trades, ${totalStats.dividends} dividends, ${totalStats.adjustments} adjustments, ${totalStats.deposits} deposits, ${totalStats.forex} forex`;
     context.result.steps.ibkrPreprocess = buildStepResult(true, message, {
       ...totalStats,
       journalFile: lastJournalFile

package/package.json

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