@fuzzle/opencode-accountant 0.12.2-next.1 → 0.13.0-next.1

package/dist/index.js

@@ -24745,8 +24745,18 @@ function generateBtcPurchaseJournal(fiatCsvPaths, btcCsvPath, yearJournalPath, l
   }
   const newEntries = [];
   let skippedDuplicates = 0;
+  const accountsUsed = new Set;
   const sortedMatches = [...matches].sort((a, b) => a.fiatRow.date.getTime() - b.fiatRow.date.getTime());
   for (const match2 of sortedMatches) {
+    const fiat = match2.fiatRow.currency.toLowerCase();
+    const pair = `${fiat}-btc`;
+    accountsUsed.add(`assets:bank:revolut:${fiat}`);
+    accountsUsed.add(`equity:conversion:${pair}:${fiat}`);
+    accountsUsed.add(`equity:conversion:${pair}:btc`);
+    accountsUsed.add("assets:bank:revolut:btc");
+    if (match2.btcRow.fees.amount > 0) {
+      accountsUsed.add("expenses:fees:btc");
+    }
     if (isDuplicate(match2, journalContent)) {
       skippedDuplicates++;
       logger?.debug(`Skipping duplicate: ${match2.fiatRow.dateStr} ${formatAmount(match2.fiatRow.amount)} ${match2.fiatRow.currency}`);
@@ -24770,7 +24780,8 @@ function generateBtcPurchaseJournal(fiatCsvPaths, btcCsvPath, yearJournalPath, l
     entriesAdded: newEntries.length,
     skippedDuplicates,
     unmatchedFiat,
-    unmatchedBtc
+    unmatchedBtc,
+    accountsUsed
   };
 }
 
@@ -26054,7 +26065,13 @@ function generateCurrencyExchangeJournal(fiatCsvPaths, yearJournalPath, logger)
   }
   if (rowsByCsv.size < 2) {
     logger?.info("Need at least 2 CSVs with EXCHANGE rows to match pairs, skipping");
-    return { matchCount: 0, entriesAdded: 0, skippedDuplicates: 0, matchedRowIndices: new Map };
+    return {
+      matchCount: 0,
+      entriesAdded: 0,
+      skippedDuplicates: 0,
+      matchedRowIndices: new Map,
+      accountsUsed: new Set
+    };
   }
   logger?.info("Matching exchange pairs across CSVs...");
   const matches = matchExchangePairs(rowsByCsv);
@@ -26065,8 +26082,16 @@ function generateCurrencyExchangeJournal(fiatCsvPaths, yearJournalPath, logger)
   }
   const newEntries = [];
   let skippedDuplicates = 0;
+  const accountsUsed = new Set;
   const sortedMatches = [...matches].sort((a, b) => a.source.date.getTime() - b.source.date.getTime());
   for (const match2 of sortedMatches) {
+    const source = match2.source.currency.toLowerCase();
+    const target = match2.target.currency.toLowerCase();
+    const pair = `${source}-${target}`;
+    accountsUsed.add(`assets:bank:revolut:${source}`);
+    accountsUsed.add(`equity:conversion:${pair}:${source}`);
+    accountsUsed.add(`equity:conversion:${pair}:${target}`);
+    accountsUsed.add(`assets:bank:revolut:${target}`);
     if (isDuplicate2(match2, journalContent)) {
       skippedDuplicates++;
       logger?.debug(`Skipping duplicate: ${match2.source.dateStr} ${formatAmount3(match2.source.amount)} ${match2.source.currency} \u2192 ${formatAmount3(match2.target.amount)} ${match2.target.currency}`);
@@ -26098,7 +26123,8 @@ function generateCurrencyExchangeJournal(fiatCsvPaths, yearJournalPath, logger)
     matchCount: matches.length,
     entriesAdded: newEntries.length,
     skippedDuplicates,
-    matchedRowIndices
+    matchedRowIndices,
+    accountsUsed
   };
 }
 
@@ -26270,6 +26296,9 @@ async function executeBtcPurchaseStep(context, contextIds, logger) {
   const year = yearMatch ? parseInt(yearMatch[1], 10) : new Date().getFullYear();
   const yearJournalPath = ensureYearJournalExists(context.directory, year);
   const result = generateBtcPurchaseJournal(fiatCsvPaths, btcCsvPath, yearJournalPath, logger);
+  for (const account of result.accountsUsed) {
+    context.generatedAccounts.add(account);
+  }
   const message = result.entriesAdded > 0 ? `Generated ${result.entriesAdded} BTC purchase entries (${result.matchCount} matched, ${result.skippedDuplicates} skipped)` : `No new BTC purchase entries (${result.matchCount} matched, ${result.skippedDuplicates} duplicates)`;
   logger?.logStep("BTC Purchases", "success", message);
   logger?.endSection();
@@ -26304,6 +26333,9 @@ async function executeCurrencyExchangeStep(context, contextIds, logger) {
   const yearJournalPath = ensureYearJournalExists(context.directory, year);
   const fiatCsvPaths = fiatContexts.map((c) => c.csvPath);
   const result = generateCurrencyExchangeJournal(fiatCsvPaths, yearJournalPath, logger);
+  for (const account of result.accountsUsed) {
+    context.generatedAccounts.add(account);
+  }
   if (result.matchedRowIndices.size > 0) {
     for (const { contextId, csvPath } of fiatContexts) {
       const indices = result.matchedRowIndices.get(csvPath);
@@ -26706,7 +26738,8 @@ async function importPipeline(directory, agent, options, configLoader = loadImpo
     options,
     configLoader,
     hledgerExecutor,
-    result
+    result,
+    generatedAccounts: new Set
   };
   try {
     const contextIds = await executeClassifyStep(context, logger);
@@ -26719,6 +26752,18 @@ async function importPipeline(directory, agent, options, configLoader = loadImpo
     await executeBtcPurchaseStep(context, contextIds, logger);
     await executeCurrencyExchangeStep(context, contextIds, logger);
     await executeSwissquotePreprocessStep(context, contextIds, logger);
+    if (context.generatedAccounts.size > 0) {
+      const firstCtx = contextIds.map((id) => loadContext(context.directory, id)).find((c) => c.provider === "revolut");
+      if (firstCtx) {
+        const yearMatch = firstCtx.filePath.match(/(\d{4})-\d{2}-\d{2}/);
+        const year = yearMatch ? parseInt(yearMatch[1], 10) : new Date().getFullYear();
+        const yearJournalPath = ensureYearJournalExists(context.directory, year);
+        const declResult = ensureAccountDeclarations(yearJournalPath, context.generatedAccounts);
+        if (declResult.added.length > 0) {
+          logger.info(`Declared ${declResult.added.length} account(s) from generated entries: ${declResult.added.join(", ")}`);
+        }
+      }
+    }
     const importConfig = loadImportConfig(context.directory);
     const orderedContextIds = [...contextIds].sort((a, b) => {
       const ctxA = loadContext(context.directory, a);

package/package.json

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