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

package/README.md

@@ -270,6 +270,15 @@ The pipeline automatically manages account declarations:
 
 **No manual account setup required.** Account declarations are created proactively before import attempts.
 
+#### Commodity Declarations
+
+For Swissquote investment imports, the pipeline automatically manages commodity declarations:
+
+- Collects all stock ticker symbols from trades, dividends, and corporate actions
+- Writes sorted `commodity "SYMBOL"` declarations to `ledger/investments/commodities.journal`
+- Merges with existing declarations (idempotent)
+- Ensures `hledger check --strict` validation passes for quoted commodity symbols
+
 #### Unknown Postings
 
 When a transaction doesn't match any `if` pattern in the rules file, hledger assigns it to `income:unknown` or `expenses:unknown` depending on the transaction direction. The pipeline will fail at the validation step, reporting the unknown postings so you can add appropriate rules before retrying.

package/agent/accountant.md

@@ -164,6 +164,15 @@ The import pipeline automatically:
 - Prevents `hledger check --strict` failures due to missing account declarations
 - No manual account setup required
 
+### Automatic Commodity Declarations
+
+For Swissquote investment imports, the pipeline automatically:
+
+- Collects all stock ticker symbols from trades, dividends, and corporate actions
+- Writes sorted `commodity "SYMBOL"` declarations to `ledger/investments/commodities.journal`
+- Merges with existing declarations (idempotent)
+- Prevents `hledger check --strict` failures due to missing commodity declarations
+
 ### Automatic Balance Detection
 
 The reconciliation step attempts to extract closing balance from:

package/dist/index.js

@@ -4258,6 +4258,19 @@ var require_brace_expansion = __commonJS((exports, module) => {
   }
 });
 
+// src/utils/journalMatchers.ts
+function extractAccount(line, pattern) {
+  const match2 = line.match(pattern);
+  return match2 ? match2[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+(.+))?$/;
+});
+
 // src/utils/accountSuggester.ts
 var exports_accountSuggester = {};
 __export(exports_accountSuggester, {
@@ -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
@@ -4533,7 +4547,7 @@ var init_accountSuggester = __esm(() => {
 
 // src/index.ts
 init_agentLoader();
-import { dirname as dirname6, join as join15 } from "path";
+import { dirname as dirname7, join as join15 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 
 // node_modules/zod/v4/classic/external.js
@@ -17051,6 +17065,38 @@ function ensureYearJournalExists(directory, year) {
   }
   return yearJournalPath;
 }
+function ensureCommodityDeclarations(commodityJournalPath, symbols, logger) {
+  const existing = new Set;
+  if (fs4.existsSync(commodityJournalPath)) {
+    const content2 = fs4.readFileSync(commodityJournalPath, "utf-8");
+    for (const line of content2.split(`
+`)) {
+      const match = line.trim().match(/^commodity\s+"(.+)"/);
+      if (match) {
+        existing.add(match[1]);
+      }
+    }
+  }
+  const missing = [];
+  for (const symbol2 of symbols) {
+    const upper = symbol2.toUpperCase();
+    if (!existing.has(upper)) {
+      missing.push(upper);
+      existing.add(upper);
+    }
+  }
+  if (missing.length === 0) {
+    return { added: [], updated: false };
+  }
+  const sorted = Array.from(existing).sort((a, b) => a.localeCompare(b));
+  const content = sorted.map((s) => `commodity "${s}"`).join(`
+`) + `
+`;
+  ensureDirectory(path3.dirname(commodityJournalPath));
+  fs4.writeFileSync(commodityJournalPath, content);
+  logger?.info(`Commodity declarations: added ${missing.length} (${missing.join(", ")})`);
+  return { added: missing.sort(), updated: true };
+}
 
 // src/utils/dateUtils.ts
 function formatDateISO(date5) {
@@ -23091,7 +23137,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();
@@ -24118,6 +24164,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;
@@ -24132,9 +24179,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;
     }
   }
@@ -24169,9 +24216,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;
     }
@@ -25016,6 +25063,9 @@ function formatDate(dateStr) {
 function escapeDescription(desc) {
   return desc.replace(/[;|]/g, "-").trim();
 }
+function formatCommodity(symbol2) {
+  return `"${symbol2.toUpperCase()}"`;
+}
 function formatQuantity(qty) {
   return qty.toFixed(6).replace(/\.?0+$/, "");
 }
@@ -25033,11 +25083,12 @@ function generateBuyEntry(trade, logger) {
   const fees = trade.costs;
   const cashOut = totalCost + fees;
   logger?.debug(`Generating Buy entry: ${qty} ${trade.symbol} @ ${price} ${trade.currency}`);
+  const commodity = formatCommodity(trade.symbol);
   let entry = `${date5} ${description}
 `;
   entry += `    ; swissquote:order:${trade.orderNum} isin:${trade.isin}
 `;
-  entry += `    assets:investments:stocks:${trade.symbol}    ${qty} @ ${price} ${trade.currency}
+  entry += `    assets:investments:stocks:${trade.symbol}    ${qty} ${commodity} @ ${price} ${trade.currency}
 `;
   if (fees > 0) {
     entry += `    expenses:fees:trading:swissquote    ${formatAmount2(fees, trade.currency)}
@@ -25057,6 +25108,7 @@ function generateSellEntry(trade, consumed, logger) {
   const cashIn = saleProceeds - fees;
   const gain = calculateCapitalGain(consumed, salePrice, trade.quantity);
   logger?.debug(`Generating Sell entry: ${qty} ${trade.symbol} @ ${salePrice} ${trade.currency}, gain: ${gain.toFixed(2)}`);
+  const commodity = formatCommodity(trade.symbol);
   let entry = `${date5} ${description}
 `;
   entry += `    ; swissquote:order:${trade.orderNum} isin:${trade.isin}
@@ -25067,7 +25119,7 @@ function generateSellEntry(trade, consumed, logger) {
   for (const c of consumed) {
     const lotQty = formatQuantity(c.quantity);
     const lotPrice = formatPrice(c.lot.costBasis);
-    entry += `    assets:investments:stocks:${trade.symbol}    -${lotQty} @ ${lotPrice} ${trade.currency}
+    entry += `    assets:investments:stocks:${trade.symbol}    -${lotQty} ${commodity} @ ${lotPrice} ${trade.currency}
 `;
   }
   entry += `    assets:broker:swissquote:${trade.currency.toLowerCase()}    ${formatAmount2(cashIn, trade.currency)}
@@ -25115,13 +25167,14 @@ function generateSplitEntry(action, oldQuantity, newQuantity, logger) {
 `;
   entry += `    ; Ratio: ${ratio.toFixed(4)} (${oldQuantity} -> ${newQuantity})
 `;
-  entry += `    assets:investments:stocks:${action.symbol}    -${formatQuantity(oldQuantity)}
+  const commodity = formatCommodity(action.symbol);
+  entry += `    assets:investments:stocks:${action.symbol}    -${formatQuantity(oldQuantity)} ${commodity}
 `;
-  entry += `    equity:conversion    ${formatQuantity(oldQuantity)}
+  entry += `    equity:conversion    ${formatQuantity(oldQuantity)} ${commodity}
 `;
-  entry += `    equity:conversion    -${formatQuantity(newQuantity)}
+  entry += `    equity:conversion    -${formatQuantity(newQuantity)} ${commodity}
 `;
-  entry += `    assets:investments:stocks:${action.symbol}    ${formatQuantity(newQuantity)}
+  entry += `    assets:investments:stocks:${action.symbol}    ${formatQuantity(newQuantity)} ${commodity}
 `;
   return entry;
 }
@@ -25138,10 +25191,11 @@ function generateWorthlessEntry(action, removedLots, logger) {
 `;
   entry += `    ; Total loss: ${totalCost.toFixed(2)} ${currency}
 `;
+  const commodity = formatCommodity(action.symbol);
   for (const lot of removedLots) {
     const qty = formatQuantity(lot.quantity);
     const price = formatPrice(lot.costBasis);
-    entry += `    assets:investments:stocks:${action.symbol}    -${qty} @ ${price} ${currency}
+    entry += `    assets:investments:stocks:${action.symbol}    -${qty} ${commodity} @ ${price} ${currency}
 `;
   }
   entry += `    expenses:losses:capital    ${formatAmount2(totalCost, currency)}
@@ -25166,16 +25220,18 @@ function generateMultiWayMergerEntry(group, crossCurrencyOutgoingSymbols, logger
   }
   for (const out of group.outgoing) {
     const qty = formatQuantity(Math.abs(out.quantity));
-    entry += `    assets:investments:stocks:${out.symbol}    -${qty}
+    const commodity = formatCommodity(out.symbol);
+    entry += `    assets:investments:stocks:${out.symbol}    -${qty} ${commodity}
 `;
-    entry += `    equity:conversion    ${qty}
+    entry += `    equity:conversion    ${qty} ${commodity}
 `;
   }
   for (const inc of group.incoming) {
     const qty = formatQuantity(Math.abs(inc.quantity));
-    entry += `    equity:conversion    -${qty}
+    const commodity = formatCommodity(inc.symbol);
+    entry += `    equity:conversion    -${qty} ${commodity}
 `;
-    entry += `    assets:investments:stocks:${inc.symbol}    ${qty}
+    entry += `    assets:investments:stocks:${inc.symbol}    ${qty} ${commodity}
 `;
   }
   return entry;
@@ -25185,11 +25241,12 @@ function generateRightsDistributionEntry(action, logger) {
   const qty = formatQuantity(Math.abs(action.quantity));
   const description = escapeDescription(`Rights Distribution: ${action.symbol} - ${action.name}`);
   logger?.debug(`Generating Rights Distribution entry: ${qty} ${action.symbol}`);
+  const commodity = formatCommodity(action.symbol);
   let entry = `${date5} ${description}
 `;
   entry += `    ; swissquote:order:${action.orderNum} isin:${action.isin}
 `;
-  entry += `    assets:investments:stocks:${action.symbol}    ${qty} @ 0.00 CAD
+  entry += `    assets:investments:stocks:${action.symbol}    ${qty} ${commodity} @ 0.00 CAD
 `;
   entry += `    income:capital-gains:rights-distribution    0.00 CAD
 `;
@@ -25757,6 +25814,23 @@ async function preprocessSwissquote(csvPath, projectDir, currency, year, lotInve
       logger?.logStep("write-journal", "success", `Created ${path13.basename(journalFile)} with ${journalEntries.length} entries`);
     }
   }
+  const stockSymbols = new Set;
+  for (const trade of trades) {
+    stockSymbols.add(trade.symbol);
+  }
+  for (const dividend of dividends) {
+    stockSymbols.add(dividend.symbol);
+  }
+  for (const action of corporateActions) {
+    stockSymbols.add(action.symbol);
+    if (action.newSymbol) {
+      stockSymbols.add(action.newSymbol);
+    }
+  }
+  if (stockSymbols.size > 0) {
+    const commodityJournalPath = path13.join(projectDir, "ledger", "investments", "commodities.journal");
+    ensureCommodityDeclarations(commodityJournalPath, stockSymbols, logger);
+  }
   logger?.logResult({
     totalRows: stats.totalRows,
     simpleTransactions: stats.simpleTransactions,
@@ -26685,7 +26759,7 @@ to produce equity conversion entries for Bitcoin purchases.
   }
 });
 // src/index.ts
-var __dirname2 = dirname6(fileURLToPath3(import.meta.url));
+var __dirname2 = dirname7(fileURLToPath3(import.meta.url));
 var AGENT_FILE = join15(__dirname2, "..", "agent", "accountant.md");
 var AccountantPlugin = async () => {
   const agent = loadAgent(AGENT_FILE);

package/docs/tools/import-pipeline.md

@@ -220,7 +220,8 @@ See [classify-statements](classify-statements.md) for details.
    - **Rights Distributions**: adds shares at zero cost basis
    - **Cross-currency mergers**: saves outgoing side to pending state, loads when incoming side is processed
 8. Generates per-year investment journal entries (`ledger/investments/{year}-{currency}.journal`) based on the CSV filename's date range
-9. Outputs filtered CSV (simple transactions only) for hledger rules import
+9. Collects all stock ticker symbols and writes commodity declarations to `ledger/investments/commodities.journal` (merged with existing, sorted, idempotent)
+10. Outputs filtered CSV (simple transactions only) for hledger rules import
 
 **Symbol Map**: Maps Swissquote's internal symbol names (e.g., `GOLD ROYALTY RG`, `VIZSLA WT 12.25`) to canonical ticker symbols (e.g., `GROY`, `VROY-WT`). Applied before any processing, so journal entries, lot inventory filenames, and account names all use the mapped symbols. See [Symbol Map Configuration](../configuration/symbol-map.md).
 

package/package.json

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