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

package/dist/index.js

@@ -16987,6 +16987,7 @@ function loadPricesConfig(directory) {
 }
 
 // src/utils/journalUtils.ts
+init_js_yaml();
 import * as fs4 from "fs";
 import * as path3 from "path";
 
@@ -17178,6 +17179,50 @@ function ensureInvestmentAccountDeclarations(accountJournalPath, accounts, logge
   logger?.info(`Account declarations: added ${missing.length} (${missing.join(", ")})`);
   return { added: missing.sort(), updated: true };
 }
+function ensureStockPriceEntries(directory, symbols, logger) {
+  const pricesPath = path3.join(directory, "config", "prices.yaml");
+  if (!fs4.existsSync(pricesPath)) {
+    return { added: [], updated: false };
+  }
+  const content = fs4.readFileSync(pricesPath, "utf-8");
+  const parsed = jsYaml.load(content);
+  const existingStocks = new Set;
+  if (parsed?.stocks && typeof parsed.stocks === "object" && !Array.isArray(parsed.stocks)) {
+    for (const key of Object.keys(parsed.stocks)) {
+      existingStocks.add(key);
+    }
+  }
+  const missing = [];
+  for (const symbol2 of symbols) {
+    const ticker = symbol2.toUpperCase();
+    if (!existingStocks.has(ticker)) {
+      missing.push(ticker);
+    }
+  }
+  if (missing.length === 0) {
+    return { added: [], updated: false };
+  }
+  let updatedContent = content;
+  if (!parsed?.stocks) {
+    updatedContent = updatedContent.trimEnd() + `
+
+stocks:
+`;
+  }
+  if (!updatedContent.endsWith(`
+`)) {
+    updatedContent += `
+`;
+  }
+  const sorted = missing.sort();
+  for (const ticker of sorted) {
+    updatedContent += `  ${ticker}:
+`;
+  }
+  fs4.writeFileSync(pricesPath, updatedContent);
+  logger?.info(`Price config: added ${sorted.length} stock(s) (${sorted.join(", ")})`);
+  return { added: sorted, updated: true };
+}
 
 // src/utils/dateUtils.ts
 function formatDateISO(date5) {
@@ -17506,7 +17551,9 @@ function validateProviderConfig(name, config2) {
   return {
     detect,
     currencies,
-    importOrder: configObj.importOrder
+    importOrder: configObj.importOrder,
+    lotInventoryPath: typeof configObj.lotInventoryPath === "string" ? configObj.lotInventoryPath : undefined,
+    symbolMapPath: typeof configObj.symbolMapPath === "string" ? configObj.symbolMapPath : undefined
   };
 }
 function loadImportConfig(directory) {
@@ -23515,7 +23562,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
@@ -26427,6 +26475,7 @@ async function preprocessSwissquote(csvPath, projectDir, currency, year, lotInve
     investmentAccounts.add(`equity:conversion:${currency.toLowerCase()}`);
     investmentAccounts.add("equity:rounding");
     ensureInvestmentAccountDeclarations(accountJournalPath, investmentAccounts, logger);
+    ensureStockPriceEntries(projectDir, stockSymbols, logger);
   }
   logger?.logResult({
     totalRows: stats.totalRows,
@@ -26968,6 +27017,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"]);
@@ -26991,7 +27068,7 @@ function parseIbkrCsv(content) {
     const account = values[3]?.trim() || "";
     const description = values[4]?.trim() || "";
     const transactionType = values[5]?.trim() || "";
-    const symbol2 = values[6]?.trim() || "";
+    const symbol2 = normalizeSymbol(values[6]?.trim() || "");
     const quantity = parseFloat(values[7] || "0") || 0;
     const price = parseFloat(values[8] || "0") || 0;
     const priceCurrency = values[9]?.trim() || "";
@@ -27064,7 +27141,7 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
         trades: 0,
         dividends: 0,
         adjustments: 0,
-        skippedForex: 0
+        forex: 0
       },
       alreadyPreprocessed: true
     };
@@ -27076,7 +27153,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);
@@ -27087,7 +27164,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}`);
     }
@@ -27173,6 +27250,38 @@ 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) {
@@ -27194,6 +27303,7 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
       const accountJournalPath = path17.join(directory, "ledger", "investments", "accounts.journal");
       ensureInvestmentAccountDeclarations(accountJournalPath, usedAccounts, logger);
     }
+    ensureStockPriceEntries(directory, tradedSymbols, logger);
     logger?.info(`Generated IBKR journal: ${journalPath} with ${journalEntries.length} entries`);
   }
   let simpleTransactionsCsvPath = null;
@@ -27230,7 +27340,7 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
       trades: trades.length,
       dividends: dividendCount,
       adjustments: adjustments.length,
-      skippedForex
+      forex: forexTxns.length
     },
     alreadyPreprocessed: false
   };
@@ -27609,7 +27719,7 @@ async function executeIbkrPreprocessStep(context, contextIds, logger) {
       trades: 0,
       dividends: 0,
       adjustments: 0,
-      skippedForex: 0
+      forex: 0
     };
     let lastJournalFile = null;
     ibkrContexts.sort((a, b) => {
@@ -27625,7 +27735,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;
       }
@@ -27635,9 +27745,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.1",
+  "version": "0.16.2-next.1",
   "description": "An OpenCode accounting agent, specialized in double-entry-bookkepping with hledger",
   "author": {
     "name": "ali bengali",