@fuzzle/opencode-accountant 0.10.8 → 0.11.0

package/dist/index.js

@@ -2739,6 +2739,19 @@ var init_agentLoader = __esm(() => {
   ]);
 });
 
+// src/utils/journalMatchers.ts
+function extractAccount(line, pattern) {
+  const match = line.match(pattern);
+  return match ? match[1].trim() : null;
+}
+var JOURNAL_ACCOUNT_DECL, RULES_ACCOUNT_DIRECTIVE, RULES_ACCOUNT2_DIRECTIVE, TX_HEADER_PATTERN;
+var init_journalMatchers = __esm(() => {
+  JOURNAL_ACCOUNT_DECL = /^account\s+(.+)$/;
+  RULES_ACCOUNT_DIRECTIVE = /^account\d+\s+(.+)$/;
+  RULES_ACCOUNT2_DIRECTIVE = /^\s*account2\s+(.+)$/;
+  TX_HEADER_PATTERN = /^(\d{4})-(\d{2}-\d{2})(\s+(.+))?$/;
+});
+
 // node_modules/papaparse/papaparse.js
 var require_papaparse = __commonJS((exports, module) => {
   (function(root, factory) {
@@ -4258,19 +4271,6 @@ var require_brace_expansion = __commonJS((exports, module) => {
   }
 });
 
-// src/utils/journalMatchers.ts
-function extractAccount(line, pattern) {
-  const match2 = line.match(pattern);
-  return match2 ? match2[1].trim() : null;
-}
-var JOURNAL_ACCOUNT_DECL, RULES_ACCOUNT_DIRECTIVE, RULES_ACCOUNT2_DIRECTIVE, TX_HEADER_PATTERN;
-var init_journalMatchers = __esm(() => {
-  JOURNAL_ACCOUNT_DECL = /^account\s+(.+)$/;
-  RULES_ACCOUNT_DIRECTIVE = /^account\d+\s+(.+)$/;
-  RULES_ACCOUNT2_DIRECTIVE = /^\s*account2\s+(.+)$/;
-  TX_HEADER_PATTERN = /^(\d{4})-(\d{2}-\d{2})(\s+(.+))?$/;
-});
-
 // src/utils/accountSuggester.ts
 var exports_accountSuggester = {};
 __export(exports_accountSuggester, {
@@ -17012,6 +17012,7 @@ function ensureDirectory(dirPath) {
 }
 
 // src/utils/journalUtils.ts
+init_journalMatchers();
 function extractDateFromPriceLine(line) {
   return line.split(" ")[1];
 }
@@ -17097,6 +17098,37 @@ function ensureCommodityDeclarations(commodityJournalPath, symbols, logger) {
   logger?.info(`Commodity declarations: added ${missing.length} (${missing.join(", ")})`);
   return { added: missing.sort(), updated: true };
 }
+function ensureInvestmentAccountDeclarations(accountJournalPath, accounts, logger) {
+  const existing = new Set;
+  if (fs4.existsSync(accountJournalPath)) {
+    const content2 = fs4.readFileSync(accountJournalPath, "utf-8");
+    for (const line of content2.split(`
+`)) {
+      const match = line.trim().match(JOURNAL_ACCOUNT_DECL);
+      if (match) {
+        existing.add(match[1]);
+      }
+    }
+  }
+  const missing = [];
+  for (const account of accounts) {
+    if (!existing.has(account)) {
+      missing.push(account);
+      existing.add(account);
+    }
+  }
+  if (missing.length === 0) {
+    return { added: [], updated: false };
+  }
+  const sorted = Array.from(existing).sort((a, b) => a.localeCompare(b));
+  const content = sorted.map((a) => `account ${a}`).join(`
+`) + `
+`;
+  ensureDirectory(path3.dirname(accountJournalPath));
+  fs4.writeFileSync(accountJournalPath, content);
+  logger?.info(`Account declarations: added ${missing.length} (${missing.join(", ")})`);
+  return { added: missing.sort(), updated: true };
+}
 
 // src/utils/dateUtils.ts
 function formatDateISO(date5) {
@@ -25033,7 +25065,7 @@ function removeLots(inventory, symbol2, logger) {
     return [];
   }
   const removedLots = [...lots];
-  delete inventory[symbol2];
+  inventory[symbol2] = [];
   const totalQuantity = removedLots.reduce((sum, lot) => sum + lot.quantity, 0);
   const totalCost = removedLots.reduce((sum, lot) => sum + lot.quantity * lot.costBasis, 0);
   logger?.info(`Removed ${removedLots.length} lots for ${symbol2}: ${totalQuantity} shares, cost basis ${totalCost}`);
@@ -25202,17 +25234,18 @@ function generateWorthlessEntry(action, removedLots, logger) {
 `;
   return entry;
 }
-function generateMultiWayMergerEntry(group, crossCurrencyOutgoingSymbols, logger) {
+function generateMultiWayMergerEntry(group, crossCurrencyOutgoingSymbols, crossCurrencyOutgoingIsins, logger) {
   const date5 = formatDate(group.date);
   const outSymbols = crossCurrencyOutgoingSymbols ?? group.outgoing.map((a) => a.symbol);
   const inSymbols = group.incoming.map((a) => a.symbol);
-  const description = escapeDescription(`Merger: ${outSymbols.join(" + ")} -> ${inSymbols.join(" + ")}`);
+  const descriptionParts = outSymbols.join(" + ");
+  const description = escapeDescription(inSymbols.length > 0 ? `Merger: ${descriptionParts} -> ${inSymbols.join(" + ")}` : `Merger: ${descriptionParts}`);
   logger?.debug(`Generating multi-way merger entry: ${outSymbols.join(", ")} -> ${inSymbols.join(", ")}`);
   let entry = `${date5} ${description}
 `;
   entry += `    ; swissquote:order:${group.orderNum}
 `;
-  const oldIsins = group.outgoing.map((a) => a.isin).filter(Boolean);
+  const oldIsins = (crossCurrencyOutgoingIsins ?? group.outgoing.map((a) => a.isin)).filter(Boolean);
   const newIsins = group.incoming.map((a) => a.isin).filter(Boolean);
   if (oldIsins.length > 0 || newIsins.length > 0) {
     entry += `    ; Old ISIN: ${oldIsins.join(", ") || "n/a"}, New ISINs: ${newIsins.join(", ") || "n/a"}
@@ -25514,7 +25547,7 @@ function processMultiWayMerger(group, inventory, lotInventoryPath, projectDir, l
         inventory[inc.symbol].push(lot);
         logger?.info(`Cross-currency merger incoming: ${absQty} ${inc.symbol} @ ${costBasisPerUnit.toFixed(2)} ${pendingState.currency}`);
       }
-      const entry2 = generateMultiWayMergerEntry(group, pendingState.outgoingSymbols, logger);
+      const entry2 = generateMultiWayMergerEntry(group, pendingState.outgoingSymbols, pendingState.outgoingIsins, logger);
       entries.push(entry2);
       removePendingMerger(projectDir, lotInventoryPath, group.key, logger);
     } else {
@@ -25545,9 +25578,12 @@ function processMultiWayMerger(group, inventory, lotInventoryPath, projectDir, l
       date: group.date,
       orderNum: group.orderNum,
       outgoingSymbols,
+      outgoingIsins: group.outgoing.map((a) => a.isin),
       totalCostBasis,
       currency: outgoingCurrency || "CAD"
     }, logger);
+    const entry2 = generateMultiWayMergerEntry(group, undefined, undefined, logger);
+    entries.push(entry2);
     logger?.info(`Cross-currency merger outgoing: ${outgoingSymbols.join(", ")} -> pending (cost basis: ${totalCostBasis.toFixed(2)})`);
     return entries;
   }
@@ -25576,7 +25612,7 @@ function processMultiWayMerger(group, inventory, lotInventoryPath, projectDir, l
     inventory[inc.symbol].push(lot);
     logger?.debug(`Merger incoming: added ${absQty} ${inc.symbol} @ ${costBasisPerUnit.toFixed(2)}`);
   }
-  const entry = generateMultiWayMergerEntry(group, undefined, logger);
+  const entry = generateMultiWayMergerEntry(group, undefined, undefined, logger);
   entries.push(entry);
   return entries;
 }
@@ -25830,6 +25866,20 @@ async function preprocessSwissquote(csvPath, projectDir, currency, year, lotInve
   if (stockSymbols.size > 0) {
     const commodityJournalPath = path13.join(projectDir, "ledger", "investments", "commodities.journal");
     ensureCommodityDeclarations(commodityJournalPath, stockSymbols, logger);
+    const accountJournalPath = path13.join(projectDir, "ledger", "investments", "accounts.journal");
+    const investmentAccounts = new Set;
+    for (const symbol2 of stockSymbols) {
+      investmentAccounts.add(`assets:investments:stocks:${symbol2}`);
+      investmentAccounts.add(`income:dividends:${symbol2}`);
+    }
+    investmentAccounts.add(`assets:broker:swissquote:${currency.toLowerCase()}`);
+    investmentAccounts.add("expenses:fees:trading:swissquote");
+    investmentAccounts.add("expenses:taxes:withholding");
+    investmentAccounts.add("income:capital-gains:realized");
+    investmentAccounts.add("income:capital-gains:rights-distribution");
+    investmentAccounts.add("expenses:losses:capital");
+    investmentAccounts.add("equity:conversion");
+    ensureInvestmentAccountDeclarations(accountJournalPath, investmentAccounts, logger);
   }
   logger?.logResult({
     totalRows: stats.totalRows,

package/package.json

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