@fuzzle/opencode-accountant 0.13.13-next.1 → 0.13.13

package/dist/index.js

@@ -25416,47 +25416,6 @@ function generateRightsDistributionEntry(action, logger) {
 `;
   return entry;
 }
-function generatePendingMergerWorthlessEntry(date5, orderNum, outgoingSymbols, outgoingIsins, outgoingQuantities, totalCostBasis, currency, logger) {
-  const formattedDate = formatDate(date5);
-  const symbols = outgoingSymbols.join(" + ");
-  const description = escapeDescription(`Worthless: ${symbols} (unresolved merger)`);
-  logger?.debug(`Generating pending merger worthless entry: ${symbols}, loss: ${totalCostBasis.toFixed(2)} ${currency}`);
-  const postings = [];
-  if (outgoingQuantities.length > 0) {
-    const totalQty = outgoingQuantities.reduce((a, b) => a + b, 0);
-    for (let i2 = 0;i2 < outgoingSymbols.length; i2++) {
-      const symbol2 = outgoingSymbols[i2];
-      const quantity = outgoingQuantities[i2] || 0;
-      if (quantity <= 0)
-        continue;
-      const proportion = totalQty > 0 ? quantity / totalQty : 0;
-      const costForSymbol = totalCostBasis * proportion;
-      const costBasisPerUnit = costForSymbol / quantity;
-      const commodity = formatCommodity(symbol2);
-      postings.push({
-        account: "equity:conversion",
-        amount: `-${formatQuantity(quantity)} ${commodity} @ ${formatPrice(costBasisPerUnit)} ${currency}`
-      });
-    }
-  }
-  postings.push({
-    account: "expenses:losses:capital",
-    amount: formatAmount2(totalCostBasis, currency)
-  });
-  let entry = `${formattedDate} ${description}
-`;
-  entry += `    ; swissquote:order:${orderNum}
-`;
-  entry += `    ; Pending merger resolved as worthless - total loss: ${totalCostBasis.toFixed(2)} ${currency}
-`;
-  if (outgoingIsins.length > 0) {
-    entry += `    ; Original ISINs: ${outgoingIsins.join(", ")}
-`;
-  }
-  entry += formatPostings(postings) + `
-`;
-  return entry;
-}
 function formatJournalFile(entries, year, currency) {
   const header = `; Swissquote ${currency.toUpperCase()} investment transactions for ${year}
 ; Generated by opencode-accountant
@@ -25614,44 +25573,6 @@ var MERGER_LIKE_TYPES = new Set([
   "Exchange of securities",
   "Corporate Action"
 ]);
-function processNonMergerAction(action, inventory, entries, logger) {
-  switch (action.type) {
-    case "Reverse Split": {
-      const qty = action.quantity;
-      if (qty < 0) {
-        return;
-      }
-      const oldQty = getHeldQuantity(inventory, action.symbol);
-      const newQty = Math.abs(qty);
-      if (oldQty > 0) {
-        const ratio = newQty / oldQty;
-        adjustLotsForSplit(inventory, action.symbol, ratio, logger);
-        const entry = generateSplitEntry(action, oldQty, newQty, logger);
-        entries.push(entry);
-      } else {
-        logger?.warn(`Reverse split for ${action.symbol} but no lots found`);
-      }
-      break;
-    }
-    case "Worthless Liquidation": {
-      const removedLots = removeLots(inventory, action.symbol, logger);
-      if (removedLots.length > 0) {
-        const entry = generateWorthlessEntry(action, removedLots, logger);
-        entries.push(entry);
-      } else {
-        logger?.warn(`Worthless liquidation for ${action.symbol} but no lots found`);
-      }
-      break;
-    }
-    case "Rights Distribution": {
-      if (action.quantity > 0) {
-        const entry = generateRightsDistributionEntry(action, logger);
-        entries.push(entry);
-      }
-      break;
-    }
-  }
-}
 function processCorporateActions(actions, inventory, lotInventoryPath, projectDir, logger) {
   const entries = [];
   actions.sort((a, b) => formatDate(a.date).localeCompare(formatDate(b.date)));
@@ -25665,19 +25586,46 @@ function processCorporateActions(actions, inventory, lotInventoryPath, projectDi
     }
   }
   const mergerGroups = groupMergerActions(mergerActions);
-  mergerGroups.sort((a, b) => formatDate(a.date).localeCompare(formatDate(b.date)));
-  let mi = 0;
-  let oi = 0;
-  while (mi < mergerGroups.length || oi < otherActions.length) {
-    const mergerDate = mi < mergerGroups.length ? formatDate(mergerGroups[mi].date) : "\uFFFF";
-    const otherDate = oi < otherActions.length ? formatDate(otherActions[oi].date) : "\uFFFF";
-    if (mergerDate <= otherDate) {
-      const groupEntries = processMultiWayMerger(mergerGroups[mi], inventory, lotInventoryPath, projectDir, logger);
-      entries.push(...groupEntries);
-      mi++;
-    } else {
-      processNonMergerAction(otherActions[oi], inventory, entries, logger);
-      oi++;
+  for (const group of mergerGroups) {
+    const groupEntries = processMultiWayMerger(group, inventory, lotInventoryPath, projectDir, logger);
+    entries.push(...groupEntries);
+  }
+  for (const action of otherActions) {
+    switch (action.type) {
+      case "Reverse Split": {
+        const qty = action.quantity;
+        if (qty < 0) {
+          continue;
+        }
+        const oldQty = getHeldQuantity(inventory, action.symbol);
+        const newQty = Math.abs(qty);
+        if (oldQty > 0) {
+          const ratio = newQty / oldQty;
+          adjustLotsForSplit(inventory, action.symbol, ratio, logger);
+          const entry = generateSplitEntry(action, oldQty, newQty, logger);
+          entries.push(entry);
+        } else {
+          logger?.warn(`Reverse split for ${action.symbol} but no lots found`);
+        }
+        break;
+      }
+      case "Worthless Liquidation": {
+        const removedLots = removeLots(inventory, action.symbol, logger);
+        if (removedLots.length > 0) {
+          const entry = generateWorthlessEntry(action, removedLots, logger);
+          entries.push(entry);
+        } else {
+          logger?.warn(`Worthless liquidation for ${action.symbol} but no lots found`);
+        }
+        break;
+      }
+      case "Rights Distribution": {
+        if (action.quantity > 0) {
+          const entry = generateRightsDistributionEntry(action, logger);
+          entries.push(entry);
+        }
+        break;
+      }
     }
   }
   return entries;
@@ -25764,7 +25712,6 @@ function processMultiWayMerger(group, inventory, lotInventoryPath, projectDir, l
       orderNum: group.orderNum,
       outgoingSymbols,
       outgoingIsins: group.outgoing.map((a) => a.isin),
-      outgoingQuantities: group.outgoing.map((a) => Math.abs(a.quantity)),
       totalCostBasis,
       currency: outgoingCurrency || "CAD"
     }, logger);
@@ -25838,68 +25785,6 @@ function removePendingMerger(projectDir, lotInventoryPath, key, logger) {
     logger?.debug(`Removed pending merger state: ${key}`);
   }
 }
-function resolveRemainingPendingMergers(projectDir, lotInventoryPath, logger) {
-  const pendingDir = getPendingMergerDir(projectDir, lotInventoryPath);
-  if (!fs18.existsSync(pendingDir)) {
-    return { resolved: 0, journalFilesUpdated: [] };
-  }
-  const files = fs18.readdirSync(pendingDir).filter((f) => f.endsWith(".json"));
-  if (files.length === 0) {
-    return { resolved: 0, journalFilesUpdated: [] };
-  }
-  const entriesByJournal = new Map;
-  const resolvedFiles = [];
-  for (const file2 of files) {
-    const filePath = path13.join(pendingDir, file2);
-    try {
-      const content = fs18.readFileSync(filePath, "utf-8");
-      const state = JSON.parse(content);
-      const dateMatch = state.date.match(/\d{2}-\d{2}-(\d{4})/);
-      if (!dateMatch) {
-        logger?.warn(`Invalid date in pending merger ${file2}: ${state.date}`);
-        continue;
-      }
-      const year = parseInt(dateMatch[1], 10);
-      const entry = generatePendingMergerWorthlessEntry(state.date, state.orderNum, state.outgoingSymbols, state.outgoingIsins, state.outgoingQuantities || [], state.totalCostBasis, state.currency, logger);
-      const journalFile = path13.join(projectDir, "ledger", "investments", `${year}-${state.currency.toLowerCase()}.journal`);
-      if (!entriesByJournal.has(journalFile)) {
-        entriesByJournal.set(journalFile, []);
-      }
-      entriesByJournal.get(journalFile).push(entry);
-      fs18.unlinkSync(filePath);
-      resolvedFiles.push(file2);
-      logger?.info(`Resolved pending merger ${file2} as worthless: ${state.outgoingSymbols.join(", ")} (${state.totalCostBasis.toFixed(2)} ${state.currency})`);
-    } catch (error45) {
-      const message = error45 instanceof Error ? error45.message : String(error45);
-      logger?.warn(`Failed to resolve pending merger ${file2}: ${message}`);
-    }
-  }
-  const journalFilesUpdated = [];
-  for (const [journalFile, journalEntries] of entriesByJournal) {
-    if (fs18.existsSync(journalFile)) {
-      fs18.appendFileSync(journalFile, `
-` + journalEntries.join(`
-`));
-    } else {
-      const basename5 = path13.basename(journalFile, ".journal");
-      const parts = basename5.split("-");
-      const yearStr = parts[0];
-      const currency = parts.slice(1).join("-");
-      const header = formatJournalFile(journalEntries, parseInt(yearStr, 10), currency);
-      fs18.writeFileSync(journalFile, header);
-    }
-    journalFilesUpdated.push(journalFile);
-    logger?.info(`Updated ${path13.basename(journalFile)} with worthless resolution entries`);
-  }
-  const remaining = fs18.readdirSync(pendingDir).filter((f) => f.endsWith(".json"));
-  if (remaining.length === 0) {
-    try {
-      fs18.rmdirSync(pendingDir);
-      logger?.debug("Removed empty pending-mergers directory");
-    } catch {}
-  }
-  return { resolved: resolvedFiles.length, journalFilesUpdated };
-}
 async function preprocessSwissquote(csvPath, projectDir, currency, year, lotInventoryPath = DEFAULT_LOT_INVENTORY_PATH, symbolMap = {}, logger) {
   logger?.startSection(`Swissquote Preprocessing: ${path13.basename(csvPath)}`);
   const stats = {
@@ -26845,10 +26730,6 @@ async function executeSwissquotePreprocessStep(context, contextIds, logger) {
       }
       logger?.logStep("Swissquote Preprocess", "success", `Processed: ${result.stats.trades} trades, ${result.stats.dividends} dividends, ${result.stats.corporateActions} corporate actions, ${result.stats.forexTransactions} forex`);
     }
-    const pendingResolution = resolveRemainingPendingMergers(context.directory, lotInventoryPath, logger);
-    if (pendingResolution.resolved > 0) {
-      logger?.logStep("Swissquote Pending Mergers", "success", `Resolved ${pendingResolution.resolved} pending merger(s) as worthless`);
-    }
     if (allForexRows.length > 0) {
       const firstCtx = swissquoteContexts[0];
       const yearJournalPath = path16.join(context.directory, "ledger", `${firstCtx.year}.journal`);

package/package.json

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