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

package/dist/index.js

@@ -23936,17 +23936,7 @@ function determineClosingBalance(csvFile, config2, importContext, manualClosingB
   if (analysisBalance) {
     return { closingBalance: analysisBalance, metadata, fromCSVAnalysis: true };
   }
-  const currency = importContext.currency?.toUpperCase() || "CHF";
-  const exampleBalance = `${currency} <amount>`;
-  const retryCmd = buildRetryCommand(importContext.id, exampleBalance);
-  return {
-    error: buildErrorResult2({
-      csvFile: relativeCsvPath,
-      error: "No closing balance found in CSV metadata or data",
-      hint: `Provide closingBalance parameter manually. Example retry: ${retryCmd}`,
-      metadata
-    })
-  };
+  return { notAvailable: true, metadata };
 }
 function buildRetryCommand(contextId, closingBalance, account) {
   const parts = ["reconcile-statement", `--contextId ${contextId}`];
@@ -24071,6 +24061,14 @@ async function reconcileStatement(directory, agent, options, configLoader = load
   }
   const { csvFile, relativePath: relativeCsvPath } = csvResult;
   const balanceResult = determineClosingBalance(csvFile, config2, importContext, options.closingBalance, relativeCsvPath, rulesDir);
+  if ("notAvailable" in balanceResult) {
+    return JSON.stringify({
+      success: true,
+      skipped: true,
+      csvFile: relativeCsvPath,
+      note: "No closing balance available \u2014 reconciliation skipped"
+    });
+  }
   if ("error" in balanceResult) {
     return balanceResult.error;
   }
@@ -24676,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(`
 `);
@@ -25939,8 +25942,8 @@ function matchExchangePairs(rowsByCsv) {
   for (const rows of rowsByCsv.values()) {
     allRows.push(...rows);
   }
-  const sources = allRows.filter((r) => r.amount > 0);
-  const targets = allRows.filter((r) => r.amount < 0);
+  const sources = allRows.filter((r) => r.amount < 0);
+  const targets = allRows.filter((r) => r.amount > 0);
   const matches = [];
   const matchedSourceIndices = new Set;
   const matchedTargetIndices = new Set;
@@ -25958,8 +25961,8 @@ function matchExchangePairs(rowsByCsv) {
       if (!source.description.includes(targetCurrency))
         continue;
       matches.push({
-        source,
-        target: { ...target, amount: Math.abs(target.amount) }
+        source: { ...source, amount: Math.abs(source.amount) },
+        target
       });
       matchedSourceIndices.add(si);
       matchedTargetIndices.add(ti);
@@ -25979,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(`
 `);
@@ -26634,6 +26640,12 @@ async function executeReconcileStep(context, contextId, logger) {
     account: context.options.account
   }, context.configLoader, context.hledgerExecutor);
   const reconcileParsed = JSON.parse(reconcileResult);
+  if (reconcileParsed.skipped) {
+    logger?.logStep("Reconcile", "success", "Skipped \u2014 no closing balance available");
+    context.result.steps.reconcile = buildStepResult(true, "Reconciliation skipped \u2014 no closing balance available", { success: true, skipped: true, note: reconcileParsed.note });
+    logger?.endSection();
+    return;
+  }
   const message = reconcileParsed.success ? `Balance reconciled: ${reconcileParsed.actualBalance}` : `Balance mismatch: expected ${reconcileParsed.expectedBalance}, got ${reconcileParsed.actualBalance}`;
   logger?.logStep("Reconcile", reconcileParsed.success ? "success" : "error", message);
   if (reconcileParsed.success) {

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",
+  "version": "0.12.2-next.1",
   "description": "An OpenCode accounting agent, specialized in double-entry-bookkepping with hledger",
   "author": {
     "name": "ali bengali",