@fuzzle/opencode-accountant 0.7.3 → 0.7.4-next.1

package/dist/index.js

@@ -23050,7 +23050,7 @@ function findRulesForCsv(csvPath, mapping) {
 // src/utils/hledgerExecutor.ts
 var {$: $2 } = globalThis.Bun;
 var STDERR_TRUNCATE_LENGTH = 500;
-var TX_HEADER_PATTERN = /^(\d{4})-(\d{2}-\d{2})\s+(.+)$/;
+var TX_HEADER_PATTERN = /^(\d{4})-(\d{2}-\d{2})(\s+(.+))?$/;
 async function defaultHledgerExecutor(cmdArgs) {
   try {
     const result = await $2`hledger ${cmdArgs}`.quiet().nothrow();
@@ -23088,7 +23088,7 @@ function parseUnknownPostings(hledgerOutput) {
     const headerMatch = line.match(TX_HEADER_PATTERN);
     if (headerMatch) {
       currentDate = `${headerMatch[1]}-${headerMatch[2]}`;
-      currentDescription = headerMatch[3].trim();
+      currentDescription = (headerMatch[4] || "").trim();
       continue;
     }
     const postingMatch = line.match(/^\s+(income:unknown|expenses:unknown)\s+([^\s]+(?:\s+[^\s=]+)?)\s*(?:=\s*(.+))?$/);
@@ -24921,7 +24921,7 @@ async function executeAccountDeclarationsStep(context, contextId, logger) {
     }
   }
   if (!transactionYear) {
-    context.result.steps.accountDeclarations = buildStepResult(false, "Could not determine transaction year from CSV files", {
+    context.result.steps.accountDeclarations = buildStepResult(true, "No transactions found, skipping account declarations", {
       accountsAdded: [],
       journalUpdated: "",
       rulesScanned: Array.from(matchedRulesFiles).map((f) => path12.relative(context.directory, f))
@@ -25064,6 +25064,13 @@ async function executeImportStep(context, contextId, logger) {
       transactionCount: importParsed.summary?.totalTransactions
     });
   }
+  const totalTx = importParsed.summary?.totalTransactions ?? 0;
+  const hasNoTransactions = totalTx === 0 && (importParsed.summary?.unknown ?? 0) === 0 && (importParsed.summary?.filesWithErrors ?? 0) === 0;
+  if (hasNoTransactions) {
+    logger?.info("No transactions found for this context");
+    logger?.endSection();
+    throw new NoTransactionsError;
+  }
   if (!importParsed.success) {
     if (detailsLog) {
       logger?.error("Import found unknown accounts or errors");
@@ -25076,10 +25083,6 @@ async function executeImportStep(context, contextId, logger) {
     context.result.hint = detailsLog ? "Add rules to categorize unknown transactions, then retry. See details above for suggestions." : undefined;
     throw new Error("Import failed");
   }
-  if (importParsed.summary?.totalTransactions === 0) {
-    logger?.endSection();
-    throw new NoTransactionsError;
-  }
   logger?.endSection();
 }
 async function executeReconcileStep(context, contextId, logger) {
@@ -25123,8 +25126,12 @@ async function executeReconcileStep(context, contextId, logger) {
   logger?.endSection();
 }
 function handleNoTransactions(result) {
-  result.steps.import = buildStepResult(true, "No transactions to import");
-  result.steps.reconcile = buildStepResult(true, "Reconciliation skipped (no transactions)");
+  if (!result.steps.import) {
+    result.steps.import = buildStepResult(true, "No transactions to import");
+  }
+  if (!result.steps.reconcile) {
+    result.steps.reconcile = buildStepResult(true, "Reconciliation skipped (no transactions)");
+  }
   return buildPipelineSuccessResult(result, "No transactions found to import");
 }
 async function importPipeline(directory, agent, options, configLoader = loadImportConfig, hledgerExecutor = defaultHledgerExecutor) {
@@ -25158,14 +25165,29 @@ async function importPipeline(directory, agent, options, configLoader = loadImpo
     }
     executePreprocessBtcStep(context, contextIds, logger);
     await executeBtcPurchaseStep(context, contextIds, logger);
+    const orderedContextIds = [...contextIds].sort((a, b) => {
+      const ctxA = loadContext(context.directory, a);
+      const ctxB = loadContext(context.directory, b);
+      const isBtcA = ctxA.provider === "revolut" && ctxA.currency === "btc" ? 1 : 0;
+      const isBtcB = ctxB.provider === "revolut" && ctxB.currency === "btc" ? 1 : 0;
+      return isBtcA - isBtcB;
+    });
     let totalTransactions = 0;
-    for (const contextId of contextIds) {
+    for (const contextId of orderedContextIds) {
       const importContext = loadContext(context.directory, contextId);
       logger.info(`Processing: ${importContext.filename} (${importContext.accountNumber || "unknown account"})`);
-      await executeAccountDeclarationsStep(context, contextId, logger);
-      await executeImportStep(context, contextId, logger);
-      await executeReconcileStep(context, contextId, logger);
-      totalTransactions += context.result.steps.import?.details?.summary?.totalTransactions || 0;
+      try {
+        await executeAccountDeclarationsStep(context, contextId, logger);
+        await executeImportStep(context, contextId, logger);
+        await executeReconcileStep(context, contextId, logger);
+        totalTransactions += context.result.steps.import?.details?.summary?.totalTransactions || 0;
+      } catch (error45) {
+        if (error45 instanceof NoTransactionsError) {
+          logger.info(`No transactions to import for ${importContext.filename}, skipping`);
+          continue;
+        }
+        throw error45;
+      }
     }
     logger.startSection("Summary");
     logger.info(`Import completed successfully`);

package/package.json

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