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

package/dist/index.js

@@ -25065,7 +25065,7 @@ function removeLots(inventory, symbol2, logger) {
     return [];
   }
   const removedLots = [...lots];
-  delete inventory[symbol2];
+  inventory[symbol2] = [];
   const totalQuantity = removedLots.reduce((sum, lot) => sum + lot.quantity, 0);
   const totalCost = removedLots.reduce((sum, lot) => sum + lot.quantity * lot.costBasis, 0);
   logger?.info(`Removed ${removedLots.length} lots for ${symbol2}: ${totalQuantity} shares, cost basis ${totalCost}`);
@@ -25234,17 +25234,18 @@ function generateWorthlessEntry(action, removedLots, logger) {
 `;
   return entry;
 }
-function generateMultiWayMergerEntry(group, crossCurrencyOutgoingSymbols, logger) {
+function generateMultiWayMergerEntry(group, crossCurrencyOutgoingSymbols, crossCurrencyOutgoingIsins, logger) {
   const date5 = formatDate(group.date);
   const outSymbols = crossCurrencyOutgoingSymbols ?? group.outgoing.map((a) => a.symbol);
   const inSymbols = group.incoming.map((a) => a.symbol);
-  const description = escapeDescription(`Merger: ${outSymbols.join(" + ")} -> ${inSymbols.join(" + ")}`);
+  const descriptionParts = outSymbols.join(" + ");
+  const description = escapeDescription(inSymbols.length > 0 ? `Merger: ${descriptionParts} -> ${inSymbols.join(" + ")}` : `Merger: ${descriptionParts}`);
   logger?.debug(`Generating multi-way merger entry: ${outSymbols.join(", ")} -> ${inSymbols.join(", ")}`);
   let entry = `${date5} ${description}
 `;
   entry += `    ; swissquote:order:${group.orderNum}
 `;
-  const oldIsins = group.outgoing.map((a) => a.isin).filter(Boolean);
+  const oldIsins = (crossCurrencyOutgoingIsins ?? group.outgoing.map((a) => a.isin)).filter(Boolean);
   const newIsins = group.incoming.map((a) => a.isin).filter(Boolean);
   if (oldIsins.length > 0 || newIsins.length > 0) {
     entry += `    ; Old ISIN: ${oldIsins.join(", ") || "n/a"}, New ISINs: ${newIsins.join(", ") || "n/a"}
@@ -25546,7 +25547,7 @@ function processMultiWayMerger(group, inventory, lotInventoryPath, projectDir, l
         inventory[inc.symbol].push(lot);
         logger?.info(`Cross-currency merger incoming: ${absQty} ${inc.symbol} @ ${costBasisPerUnit.toFixed(2)} ${pendingState.currency}`);
       }
-      const entry2 = generateMultiWayMergerEntry(group, pendingState.outgoingSymbols, logger);
+      const entry2 = generateMultiWayMergerEntry(group, pendingState.outgoingSymbols, pendingState.outgoingIsins, logger);
       entries.push(entry2);
       removePendingMerger(projectDir, lotInventoryPath, group.key, logger);
     } else {
@@ -25577,9 +25578,12 @@ function processMultiWayMerger(group, inventory, lotInventoryPath, projectDir, l
       date: group.date,
       orderNum: group.orderNum,
       outgoingSymbols,
+      outgoingIsins: group.outgoing.map((a) => a.isin),
       totalCostBasis,
       currency: outgoingCurrency || "CAD"
     }, logger);
+    const entry2 = generateMultiWayMergerEntry(group, undefined, undefined, logger);
+    entries.push(entry2);
     logger?.info(`Cross-currency merger outgoing: ${outgoingSymbols.join(", ")} -> pending (cost basis: ${totalCostBasis.toFixed(2)})`);
     return entries;
   }
@@ -25608,7 +25612,7 @@ function processMultiWayMerger(group, inventory, lotInventoryPath, projectDir, l
     inventory[inc.symbol].push(lot);
     logger?.debug(`Merger incoming: added ${absQty} ${inc.symbol} @ ${costBasisPerUnit.toFixed(2)}`);
   }
-  const entry = generateMultiWayMergerEntry(group, undefined, logger);
+  const entry = generateMultiWayMergerEntry(group, undefined, undefined, logger);
   entries.push(entry);
   return entries;
 }

package/package.json

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