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

package/dist/index.js

@@ -26989,62 +26989,6 @@ function generateIbkrDividendEntry(dividend, logger) {
 `;
   return entry;
 }
-function generateIbkrAdjustmentEntry(adjustment, logger) {
-  const description = escapeDescription(adjustment.description);
-  logger?.debug(`Generating IBKR Adjustment entry: ${adjustment.amount} ${adjustment.currency}`);
-  const postings = [
-    {
-      account: `assets:broker:ibkr:${adjustment.currency.toLowerCase()}`,
-      amount: formatAmount(adjustment.amount, adjustment.currency)
-    }
-  ];
-  if (adjustment.amount < 0) {
-    postings.push({
-      account: "expenses:fx-losses:ibkr",
-      amount: formatAmount(Math.abs(adjustment.amount), adjustment.currency)
-    });
-  } else {
-    postings.push({
-      account: "income:fx-gains:ibkr",
-      amount: formatAmount(-adjustment.amount, adjustment.currency)
-    });
-  }
-  let entry = `${adjustment.date} ${description}
-`;
-  entry += `    ; ibkr:account:${adjustment.account}
-`;
-  entry += formatPostings(postings) + `
-`;
-  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"]);
@@ -27126,25 +27070,34 @@ function groupDividends(transactions) {
   groups.sort((a, b) => a.date.localeCompare(b.date));
   return groups;
 }
+function isIbkrEntryDuplicate(entry, existingJournalContent) {
+  if (!existingJournalContent)
+    return false;
+  const firstLine = entry.split(`
+`)[0].trim();
+  if (!firstLine)
+    return false;
+  if (!existingJournalContent.includes(firstLine))
+    return false;
+  const brokerLine = entry.split(`
+`).find((l) => l.includes("assets:broker:ibkr:"));
+  if (!brokerLine)
+    return true;
+  const amountMatch = brokerLine.match(/(-?\d+\.\d+\s+[A-Z]+)/);
+  if (!amountMatch)
+    return true;
+  const idx = existingJournalContent.indexOf(firstLine);
+  const chunk = existingJournalContent.slice(idx, idx + 500);
+  return chunk.includes(amountMatch[1]);
+}
 async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPath, logger) {
   const csvDir = path17.dirname(csvPath);
   const csvBasename = path17.basename(csvPath, ".csv");
   const journalPath = path17.join(directory, "ledger", "investments", `${year}-ibkr-${currency}.journal`);
+  let existingJournalContent = "";
   if (fs22.existsSync(journalPath)) {
-    logger?.info(`IBKR journal already exists: ${journalPath}, skipping preprocessing`);
-    return {
-      simpleTransactionsCsv: null,
-      journalFile: journalPath,
-      stats: {
-        totalRows: 0,
-        deposits: 0,
-        trades: 0,
-        dividends: 0,
-        adjustments: 0,
-        forex: 0
-      },
-      alreadyPreprocessed: true
-    };
+    existingJournalContent = fs22.readFileSync(journalPath, "utf-8");
+    logger?.info(`Found existing IBKR journal: ${journalPath}, will check for new entries`);
   }
   const content = fs22.readFileSync(csvPath, "utf-8");
   const transactions = parseIbkrCsv(content);
@@ -27175,7 +27128,6 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
   const usedAccounts = new Set;
   const journalEntries = [];
   for (const trade of trades) {
-    tradedSymbols.add(trade.symbol);
     const totalCost = Math.abs(trade.grossAmount);
     const unitPrice = trade.quantity !== 0 ? totalCost / Math.abs(trade.quantity) : 0;
     const tradeEntry = {
@@ -27191,6 +27143,11 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
       currency: currency.toUpperCase()
     };
     if (trade.transactionType === "Buy") {
+      const entry = generateIbkrBuyEntry(tradeEntry, logger);
+      if (isIbkrEntryDuplicate(entry, existingJournalContent)) {
+        logger?.debug(`Skipping duplicate Buy: ${trade.date} ${trade.symbol}`);
+        continue;
+      }
       const tradeInfo = {
         date: trade.date,
         orderNum: "",
@@ -27201,13 +27158,19 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
         currency: currency.toUpperCase()
       };
       addLot(inventory, tradeInfo, logger);
-      journalEntries.push(generateIbkrBuyEntry(tradeEntry, logger));
+      journalEntries.push(entry);
+      tradedSymbols.add(trade.symbol);
       usedAccounts.add(`assets:investments:stocks:${trade.symbol}`);
       usedAccounts.add(`assets:broker:ibkr:${currency}`);
       usedAccounts.add("expenses:fees:trading:ibkr");
     } else {
+      if (existingJournalContent.includes(`${trade.date} Sell ${trade.symbol} - `)) {
+        logger?.debug(`Skipping duplicate Sell: ${trade.date} ${trade.symbol}`);
+        continue;
+      }
       const consumed = consumeLotsFIFO(inventory, trade.symbol, Math.abs(trade.quantity), logger);
       journalEntries.push(generateIbkrSellEntry(tradeEntry, consumed, logger));
+      tradedSymbols.add(trade.symbol);
       usedAccounts.add(`assets:investments:stocks:${trade.symbol}`);
       usedAccounts.add(`assets:broker:ibkr:${currency}`);
       usedAccounts.add("expenses:fees:trading:ibkr");
@@ -27226,74 +27189,36 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
       netAmount,
       currency: currency.toUpperCase()
     };
-    journalEntries.push(generateIbkrDividendEntry(dividendEntry, logger));
+    const entry = generateIbkrDividendEntry(dividendEntry, logger);
+    if (isIbkrEntryDuplicate(entry, existingJournalContent)) {
+      logger?.debug(`Skipping duplicate Dividend: ${group.date} ${group.symbol}`);
+      continue;
+    }
+    journalEntries.push(entry);
     usedAccounts.add(`assets:broker:ibkr:${currency}`);
     usedAccounts.add(`income:dividends:${group.symbol}`);
     if (group.withholdingTax > 0) {
       usedAccounts.add("expenses:taxes:withholding");
     }
   }
-  adjustments.sort((a, b) => a.date.localeCompare(b.date));
-  for (const adj of adjustments) {
-    const adjustmentEntry = {
-      date: adj.date,
-      account: adj.account,
-      description: adj.description || "FX Translations P&L",
-      amount: adj.netAmount,
-      currency: currency.toUpperCase()
-    };
-    journalEntries.push(generateIbkrAdjustmentEntry(adjustmentEntry, logger));
-    usedAccounts.add(`assets:broker:ibkr:${currency}`);
-    if (adj.netAmount < 0) {
-      usedAccounts.add("expenses:fx-losses:ibkr");
-    } else {
-      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;
+  let journalFilePath = existingJournalContent ? journalPath : null;
   if (journalEntries.length > 0) {
-    const header = `; IBKR ${currency.toUpperCase()} investment transactions for ${year}
-; Generated by opencode-accountant
-; This file is auto-generated - do not edit manually`;
-    const journalContent = formatJournalFile(journalEntries, header);
     const investmentsDir = path17.join(directory, "ledger", "investments");
     if (!fs22.existsSync(investmentsDir)) {
       fs22.mkdirSync(investmentsDir, { recursive: true });
     }
-    fs22.writeFileSync(journalPath, journalContent);
+    if (existingJournalContent) {
+      fs22.appendFileSync(journalPath, `
+` + journalEntries.join(`
+`));
+    } else {
+      const header = `; IBKR ${currency.toUpperCase()} investment transactions for ${year}
+; Generated by opencode-accountant
+; This file is auto-generated - do not edit manually`;
+      const journalContent = formatJournalFile(journalEntries, header);
+      fs22.writeFileSync(journalPath, journalContent);
+    }
     journalFilePath = journalPath;
     if (tradedSymbols.size > 0) {
       const commodityJournalPath = path17.join(directory, "ledger", "investments", "commodities.journal");
@@ -27306,11 +27231,12 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
     ensureStockPriceEntries(directory, tradedSymbols, logger);
     logger?.info(`Generated IBKR journal: ${journalPath} with ${journalEntries.length} entries`);
   }
+  const simpleTransactions = [...deposits, ...adjustments, ...forexTxns];
   let simpleTransactionsCsvPath = null;
-  if (deposits.length > 0) {
+  if (simpleTransactions.length > 0) {
     const filteredCsvPath = path17.join(csvDir, `${csvBasename}-filtered.csv`);
     const csvHeader = "Date,Account,Description,Transaction Type,Symbol,Quantity,Price,Price Currency,Gross Amount,Commission,Net Amount";
-    const csvRows = deposits.map((d) => [
+    const csvRows = simpleTransactions.map((d) => [
       d.date,
       d.account,
       `"${d.description.replace(/"/g, '""')}"`,
@@ -27328,7 +27254,7 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
 `) + `
 `);
     simpleTransactionsCsvPath = filteredCsvPath;
-    logger?.info(`Generated filtered CSV for deposits: ${filteredCsvPath} (${deposits.length} rows)`);
+    logger?.info(`Generated filtered CSV: ${filteredCsvPath} (${simpleTransactions.length} rows)`);
   }
   const dividendCount = dividendGroups.length;
   return {

package/package.json

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