@fuzzle/opencode-accountant 0.10.7 → 0.10.8-next.1

package/dist/index.js

@@ -2739,6 +2739,19 @@ var init_agentLoader = __esm(() => {
   ]);
 });
 
+// src/utils/journalMatchers.ts
+function extractAccount(line, pattern) {
+  const match = line.match(pattern);
+  return match ? match[1].trim() : null;
+}
+var JOURNAL_ACCOUNT_DECL, RULES_ACCOUNT_DIRECTIVE, RULES_ACCOUNT2_DIRECTIVE, TX_HEADER_PATTERN;
+var init_journalMatchers = __esm(() => {
+  JOURNAL_ACCOUNT_DECL = /^account\s+(.+)$/;
+  RULES_ACCOUNT_DIRECTIVE = /^account\d+\s+(.+)$/;
+  RULES_ACCOUNT2_DIRECTIVE = /^\s*account2\s+(.+)$/;
+  TX_HEADER_PATTERN = /^(\d{4})-(\d{2}-\d{2})(\s+(.+))?$/;
+});
+
 // node_modules/papaparse/papaparse.js
 var require_papaparse = __commonJS((exports, module) => {
   (function(root, factory) {
@@ -4287,9 +4300,9 @@ function loadExistingAccounts(yearJournalPath) {
   for (const line of lines) {
     const trimmed = line.trim();
     if (trimmed.startsWith("account ")) {
-      const match2 = trimmed.match(/^account\s+(.+?)(?:\s+|$)/);
-      if (match2) {
-        accounts.push(match2[1].trim());
+      const accountName = extractAccount(trimmed, JOURNAL_ACCOUNT_DECL);
+      if (accountName) {
+        accounts.push(accountName);
       }
     }
   }
@@ -4314,11 +4327,11 @@ function extractRulePatternsFromFile(rulesPath) {
       currentCondition = ifMatch[1].trim();
       continue;
     }
-    const account2Match = trimmed.match(/^\s*account2\s+(.+?)(?:\s+|$)/);
-    if (account2Match && currentCondition) {
+    const account2Name = extractAccount(trimmed, RULES_ACCOUNT2_DIRECTIVE);
+    if (account2Name && currentCondition) {
       patterns.push({
         condition: currentCondition,
-        account: account2Match[1].trim()
+        account: account2Name
       });
       currentCondition = null;
       continue;
@@ -4504,6 +4517,7 @@ function generateMockSuggestions(postings) {
 var EXAMPLE_PATTERN_SAMPLE_SIZE = 10, suggestionCache, RESPONSE_FORMAT_SECTION;
 var init_accountSuggester = __esm(() => {
   init_agentLoader();
+  init_journalMatchers();
   suggestionCache = {};
   RESPONSE_FORMAT_SECTION = [
     `## Task
@@ -16998,6 +17012,7 @@ function ensureDirectory(dirPath) {
 }
 
 // src/utils/journalUtils.ts
+init_journalMatchers();
 function extractDateFromPriceLine(line) {
   return line.split(" ")[1];
 }
@@ -17083,6 +17098,37 @@ function ensureCommodityDeclarations(commodityJournalPath, symbols, logger) {
   logger?.info(`Commodity declarations: added ${missing.length} (${missing.join(", ")})`);
   return { added: missing.sort(), updated: true };
 }
+function ensureInvestmentAccountDeclarations(accountJournalPath, accounts, logger) {
+  const existing = new Set;
+  if (fs4.existsSync(accountJournalPath)) {
+    const content2 = fs4.readFileSync(accountJournalPath, "utf-8");
+    for (const line of content2.split(`
+`)) {
+      const match = line.trim().match(JOURNAL_ACCOUNT_DECL);
+      if (match) {
+        existing.add(match[1]);
+      }
+    }
+  }
+  const missing = [];
+  for (const account of accounts) {
+    if (!existing.has(account)) {
+      missing.push(account);
+      existing.add(account);
+    }
+  }
+  if (missing.length === 0) {
+    return { added: [], updated: false };
+  }
+  const sorted = Array.from(existing).sort((a, b) => a.localeCompare(b));
+  const content = sorted.map((a) => `account ${a}`).join(`
+`) + `
+`;
+  ensureDirectory(path3.dirname(accountJournalPath));
+  fs4.writeFileSync(accountJournalPath, content);
+  logger?.info(`Account declarations: added ${missing.length} (${missing.join(", ")})`);
+  return { added: missing.sort(), updated: true };
+}
 
 // src/utils/dateUtils.ts
 function formatDateISO(date5) {
@@ -23123,7 +23169,7 @@ function findRulesForCsv(csvPath, mapping) {
 
 // src/utils/hledgerExecutor.ts
 var {$: $2 } = globalThis.Bun;
-var TX_HEADER_PATTERN = /^(\d{4})-(\d{2}-\d{2})(\s+(.+))?$/;
+init_journalMatchers();
 async function defaultHledgerExecutor(cmdArgs) {
   try {
     const result = await $2`hledger ${cmdArgs}`.quiet().nothrow();
@@ -24150,6 +24196,7 @@ import * as fs20 from "fs";
 import * as path14 from "path";
 
 // src/utils/accountDeclarations.ts
+init_journalMatchers();
 import * as fs12 from "fs";
 function extractAccountsFromRulesFile(rulesPath) {
   const accounts = new Set;
@@ -24164,9 +24211,9 @@ function extractAccountsFromRulesFile(rulesPath) {
     if (trimmed.startsWith("#") || trimmed.startsWith(";") || trimmed === "") {
       continue;
     }
-    const accountMatch = trimmed.match(/^account\d+\s+(.+?)(?:\s+|$)/);
-    if (accountMatch) {
-      accounts.add(accountMatch[1].trim());
+    const accountName = extractAccount(trimmed, RULES_ACCOUNT_DIRECTIVE);
+    if (accountName) {
+      accounts.add(accountName);
       continue;
     }
   }
@@ -24201,9 +24248,9 @@ function parseJournalSections(content) {
     }
     if (trimmed.startsWith("account ")) {
       inAccountSection = true;
-      const accountMatch = trimmed.match(/^account\s+(.+?)(?:\s+|$)/);
-      if (accountMatch) {
-        existingAccounts.add(accountMatch[1].trim());
+      const accountName = extractAccount(trimmed, JOURNAL_ACCOUNT_DECL);
+      if (accountName) {
+        existingAccounts.add(accountName);
       }
       continue;
     }
@@ -25815,6 +25862,20 @@ async function preprocessSwissquote(csvPath, projectDir, currency, year, lotInve
   if (stockSymbols.size > 0) {
     const commodityJournalPath = path13.join(projectDir, "ledger", "investments", "commodities.journal");
     ensureCommodityDeclarations(commodityJournalPath, stockSymbols, logger);
+    const accountJournalPath = path13.join(projectDir, "ledger", "investments", "accounts.journal");
+    const investmentAccounts = new Set;
+    for (const symbol2 of stockSymbols) {
+      investmentAccounts.add(`assets:investments:stocks:${symbol2}`);
+      investmentAccounts.add(`income:dividends:${symbol2}`);
+    }
+    investmentAccounts.add(`assets:broker:swissquote:${currency.toLowerCase()}`);
+    investmentAccounts.add("expenses:fees:trading:swissquote");
+    investmentAccounts.add("expenses:taxes:withholding");
+    investmentAccounts.add("income:capital-gains:realized");
+    investmentAccounts.add("income:capital-gains:rights-distribution");
+    investmentAccounts.add("expenses:losses:capital");
+    investmentAccounts.add("equity:conversion");
+    ensureInvestmentAccountDeclarations(accountJournalPath, investmentAccounts, logger);
   }
   logger?.logResult({
     totalRows: stats.totalRows,

package/package.json

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