@fuzzle/opencode-accountant 0.15.1-next.1 → 0.16.0-next.1

package/dist/index.js

@@ -24035,7 +24035,7 @@ function buildRetryCommand(contextId, closingBalance, account) {
   }
   return parts.join(" ");
 }
-function determineAccount(csvFile, rulesDir, importContext, manualAccount, relativeCsvPath, metadata) {
+function determineAccount(csvFile, rulesDir, directory, importContext, manualAccount, relativeCsvPath, metadata) {
   let account = manualAccount;
   const rulesMapping = loadRulesMapping(rulesDir);
   const rulesFile = findRulesForCsv(csvFile, rulesMapping);
@@ -24043,6 +24043,12 @@ function determineAccount(csvFile, rulesDir, importContext, manualAccount, relat
     if (rulesFile) {
       account = getAccountFromRulesFile(rulesFile) ?? undefined;
     }
+    if (!account && importContext.rulesFile) {
+      const contextRulesPath = path10.join(directory, importContext.rulesFile);
+      if (fs11.existsSync(contextRulesPath)) {
+        account = getAccountFromRulesFile(contextRulesPath) ?? undefined;
+      }
+    }
   }
   if (!account) {
     const rulesHint = rulesFile ? `Add 'account1 assets:bank:...' to ${rulesFile} or retry with: ${buildRetryCommand(importContext.id, undefined, "assets:bank:...")}` : `Create a rules file in ${rulesDir} with 'account1' directive or retry with: ${buildRetryCommand(importContext.id, undefined, "assets:bank:...")}`;
@@ -24160,7 +24166,7 @@ async function reconcileStatement(directory, agent, options, configLoader = load
     return balanceResult.error;
   }
   const { closingBalance, metadata, fromCSVAnalysis } = balanceResult;
-  const accountResult = determineAccount(csvFile, rulesDir, importContext, options.account, relativeCsvPath, metadata);
+  const accountResult = determineAccount(csvFile, rulesDir, directory, importContext, options.account, relativeCsvPath, metadata);
   if ("error" in accountResult) {
     return accountResult.error;
   }
@@ -27170,7 +27176,6 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
   saveLotInventory(directory, lotInventoryPath, inventory, logger);
   let journalFilePath = null;
   if (journalEntries.length > 0) {
-    const yearJournalPath = ensureYearJournalExists(directory, year);
     const header = `; IBKR ${currency.toUpperCase()} investment transactions for ${year}
 ; Generated by opencode-accountant
 ; This file is auto-generated - do not edit manually`;
@@ -27181,13 +27186,6 @@ async function preprocessIbkr(csvPath, directory, currency, year, lotInventoryPa
     }
     fs22.writeFileSync(journalPath, journalContent);
     journalFilePath = journalPath;
-    const yearJournalContent = fs22.readFileSync(yearJournalPath, "utf-8");
-    const includeDirective = `include investments/${path17.basename(journalPath)}`;
-    if (!yearJournalContent.includes(includeDirective)) {
-      fs22.writeFileSync(yearJournalPath, yearJournalContent.trimEnd() + `
-` + includeDirective + `
-`);
-    }
     if (tradedSymbols.size > 0) {
       const commodityJournalPath = path17.join(directory, "ledger", "investments", "commodities.journal");
       ensureCommodityDeclarations(commodityJournalPath, tradedSymbols, logger);

package/package.json

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