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

package/dist/index.js

@@ -24674,17 +24674,22 @@ function formatJournalEntry(match2) {
   const btcPrice = formatAmount(btcRow.price.amount);
   const priceCurrency = btcRow.price.currency;
   const hasFees = btcRow.fees.amount > 0;
+  const isBaseCurrency = fiatCurrency === "CHF";
+  const pair = `${fiatCurrency.toLowerCase()}-btc`;
+  const equityFiat = `equity:conversion:${pair}:${fiatCurrency.toLowerCase()}`;
+  const equityBtc = `equity:conversion:${pair}:btc`;
+  const assetCostAnnotation = isBaseCurrency ? `  @  ${btcPrice} ${priceCurrency}` : "";
   const lines = [
     `${date5} Bitcoin purchase`,
     `    assets:bank:revolut:${fiatCurrency.toLowerCase()}    -${fiatAmount} ${fiatCurrency}`,
-    `    equity:bitcoin:conversion   ${fiatAmount} ${fiatCurrency}`,
-    `    equity:bitcoin:conversion  -${btcQuantity} BTC  @  ${btcPrice} ${priceCurrency}`,
-    `    assets:bank:revolut:btc     ${btcQuantity} BTC  @  ${btcPrice} ${priceCurrency}`
+    `    ${equityFiat}   ${fiatAmount} ${fiatCurrency}`,
+    `    ${equityBtc}  -${btcQuantity} BTC`,
+    `    assets:bank:revolut:btc     ${btcQuantity} BTC${assetCostAnnotation}`
   ];
   if (hasFees) {
     const feeAmount = formatAmount(btcRow.fees.amount);
     const feeCurrency = btcRow.fees.currency;
-    lines.push(`    expenses:fees:btc       ${feeAmount} ${feeCurrency}`, `    equity:bitcoin:conversion  -${feeAmount} ${feeCurrency}`);
+    lines.push(`    expenses:fees:btc       ${feeAmount} ${feeCurrency}`, `    ${equityFiat}  -${feeAmount} ${feeCurrency}`);
   }
   return lines.join(`
 `);
@@ -25977,11 +25982,14 @@ function formatExchangeEntry(match2) {
   const targetCurrency = target.currency;
   const sourceAmount = formatAmount3(source.amount);
   const targetAmount = formatAmount3(target.amount);
+  const pair = `${sourceCurrency.toLowerCase()}-${targetCurrency.toLowerCase()}`;
+  const equitySource = `equity:conversion:${pair}:${sourceCurrency.toLowerCase()}`;
+  const equityTarget = `equity:conversion:${pair}:${targetCurrency.toLowerCase()}`;
   return [
     `${date5} ${description}`,
     `    assets:bank:revolut:${sourceCurrency.toLowerCase()}    -${sourceAmount} ${sourceCurrency}`,
-    `    equity:currency:conversion   ${sourceAmount} ${sourceCurrency}`,
-    `    equity:currency:conversion  -${targetAmount} ${targetCurrency}`,
+    `    ${equitySource}   ${sourceAmount} ${sourceCurrency}`,
+    `    ${equityTarget}  -${targetAmount} ${targetCurrency}`,
     `    assets:bank:revolut:${targetCurrency.toLowerCase()}     ${targetAmount} ${targetCurrency}`
   ].join(`
 `);

package/docs/tools/import-pipeline.md

@@ -211,7 +211,7 @@ See [classify-statements](classify-statements.md) for details.
 1. Finds all Revolut fiat contexts (provider=revolut, currency≠btc) from classification
 2. Parses each CSV for `EXCHANGE` rows with "Exchanged to" descriptions
 3. Matches source (debited) and target (credited) rows across CSVs by timestamp (within 1 second)
-4. Generates unified 4-posting journal entries using `equity:currency:conversion` with `@ cost` notation
+4. Generates unified 4-posting journal entries using per-pair `equity:conversion:{pair}:{currency}` trading sub-accounts
 5. Appends entries to year journal, skipping duplicates
 6. Filters matched EXCHANGE rows from CSVs (writes `-filtered.csv`) so hledger import doesn't double-count them
 7. Updates import contexts to point to filtered CSVs
@@ -220,13 +220,13 @@ See [classify-statements](classify-statements.md) for details.
 
 ```journal
 2026-01-15 Exchanged to EUR
-    assets:bank:revolut:chf    -100.00 CHF @ 1.0713 EUR
-    equity:currency:conversion   100.00 CHF
-    equity:currency:conversion  -107.13 EUR
-    assets:bank:revolut:eur     107.13 EUR
+    assets:bank:revolut:chf              -100.00 CHF
+    equity:conversion:chf-eur:chf         100.00 CHF
+    equity:conversion:chf-eur:eur        -107.13 EUR
+    assets:bank:revolut:eur               107.13 EUR
 ```
 
-**Why**: Revolut exports currency exchanges as two separate CSV rows — one per currency. Processing each through its own rules file produces two independent 2-posting transactions with a non-zero `equity:conversion` balance. This step intercepts EXCHANGE rows before hledger import, matches them across currencies, and generates a single unified transaction with explicit cost notation that keeps `equity:currency:conversion` balanced.
+**Why**: Revolut exports currency exchanges as two separate CSV rows — one per currency. Processing each through its own rules file produces two independent 2-posting transactions with a non-zero `equity:conversion` balance. This step intercepts EXCHANGE rows before hledger import, matches them across currencies, and generates a single unified transaction with per-pair trading sub-accounts that keep each `equity:conversion:{pair}` balanced.
 
 **Skipped when**: Fewer than 2 Revolut fiat CSVs with EXCHANGE rows are present among the classified files.
 

package/package.json

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