kvitton-cli 0.4.4 → 0.4.6

package/dist/index.js

@@ -6475,16 +6475,16 @@ This is an accounting data repository for {{COMPANY_NAME}} (Swedish company), st
 
 ## CLI Commands
 
-Use the \`kvitton\` CLI to interact with this repository:
+Use the \`npx kvitton-cli\` CLI to interact with this repository:
 
 \`\`\`bash
 # Sync data from provider
-kvitton sync-journal          # Sync journal entries from accounting provider
-kvitton sync-inbox            # Download inbox files from accounting provider
-kvitton company-info          # Display company information
+npx kvitton-cli sync-journal          # Sync journal entries from accounting provider
+npx kvitton-cli sync-inbox            # Download inbox files from accounting provider
+npx kvitton-cli company-info          # Display company information
 
 # Create journal entries
-kvitton create-entry --path <inbox-dir-or-file> \\
+npx kvitton-cli create-entry --path <inbox-dir-or-file> \\
   --tax-code <code> --base-account <acc> --balancing-account <acc> \\
   --series <A-K> --entry-number <num>
 
@@ -6492,27 +6492,27 @@ kvitton create-entry --path <inbox-dir-or-file> \\
 #   --description "Vendor name" --document-date 2025-01-15 --amount 1234.50
 
 # Manage inbox
-kvitton discard <inbox-directory>   # Remove item, mark for deletion from provider
-kvitton parse-pdf -f <file.pdf>     # Extract text from PDF (for analysis)
+npx kvitton-cli discard <inbox-directory>   # Remove item, mark for deletion from provider
+npx kvitton-cli parse-pdf -f <file.pdf>     # Extract text from PDF (for analysis)
 
 # Currency conversion
-kvitton convert-currency --amount <num> --currency <code> [--date YYYY-MM-DD]
+npx kvitton-cli convert-currency --amount <num> --currency <code> [--date YYYY-MM-DD]
   # Converts foreign currency to SEK using Riksbank exchange rates
   # Caches rates locally for efficiency
 
 # Generate journal entry lines (alternative to create-entry for adding lines)
-kvitton generate-lines --inbox-dir <path> \\
+npx kvitton-cli generate-lines --inbox-dir <path> \\
   --tax-code <code> --base-amount <num> --base-account <acc> \\
-  --balancing-account <acc> [--memo "description"] [--amount-currency USD]
+  --balancing-account <acc> [--memo "description"] [--currency USD]
 
 # List available tax codes
-kvitton list-tax-codes
+npx kvitton-cli list-tax-codes
 
 # Update instructions
-kvitton update                # Update AGENTS.md to latest version
+npx kvitton-cli update                # Update AGENTS.md to latest version
 \`\`\`
 
-**Currency Conversion:** Both \`create-entry\` and \`generate-lines\` automatically convert to SEK when \`--amount-currency\` is different from SEK, using Riksbank exchange rates for the entry date.
+**Currency Conversion:** Both \`create-entry\` and \`generate-lines\` automatically convert to SEK when \`--currency\` is different from SEK, using Riksbank exchange rates for the entry date.
 
 ## Workflow Overview
 
@@ -6526,17 +6526,21 @@ inbox/ → (create-entry) → drafts/ → (user confirms) → journal-entries/
 
 To create a journal entry from an inbox document:
 
-1. **Read the document** - Use \`kvitton parse-pdf\` for PDFs to understand the content
-2. **Look for similar entries** - Search \`journal-entries/\` and \`drafts/\` for entries from the same vendor or similar transaction types to learn which accounts and tax codes were used previously
-3. **Check accounts** - Review \`accounts.yaml\` for appropriate expense/revenue accounts
-4. **Determine tax code** - Based on vendor location and transaction type (see Tax Codes below)
-5. **Ask for confirmation** - Before creating, confirm with the user: vendor, amount, accounts, and tax code
-6. **Create entry** - Run \`kvitton create-entry\` with the appropriate parameters
-7. **Files moved to drafts** - The inbox item is automatically moved to \`drafts/\` with \`entry.yaml\`
+1. **Read the document** - Use \`npx kvitton-cli parse-pdf\` for PDFs to understand the content
+2. **Update documents.yaml** - After parsing, populate missing metadata in \`documents.yaml\`:
+   - \`documentDate\`: Invoice/receipt date (YYYY-MM-DD)
+   - \`description\`: Vendor or document name
+   - \`totalAmount\`: With \`amount\` (string) and \`currency\` (e.g., EUR, SEK)
+3. **Look for similar entries** - Search \`journal-entries/\` and \`drafts/\` for entries from the same vendor or similar transaction types to learn which accounts and tax codes were used previously
+4. **Check accounts** - Review \`accounts.yaml\` for appropriate expense/revenue accounts
+5. **Determine tax code** - Based on vendor location and transaction type (see Tax Codes below). Explain your reasoning and describe the tax code meaning to the user
+6. **Ask for confirmation** - Before creating, confirm with the user: vendor, amount, accounts (with names), and tax code (with description)
+7. **Create entry** - Run \`npx kvitton-cli create-entry\` with the appropriate parameters
+8. **Files moved to drafts** - The inbox item is automatically moved to \`drafts/\` with \`entry.yaml\`
 
 To discard unwanted inbox items:
 \`\`\`bash
-kvitton discard inbox/2025-01-15-spam-document
+npx kvitton-cli discard inbox/2025-01-15-spam-document
 \`\`\`
 This removes the directory and marks the item for deletion from the provider on next sync.
 
@@ -6554,7 +6558,7 @@ When the user confirms draft entries are ready to post:
    \`\`\`
    Format: \`{SERIES}-{NUM}-{DATE}-{DESC}/\`
 3. **Update entry.yaml** - Ensure \`entryNumber\` matches the directory and \`status\` is set appropriately
-4. **Sync to provider** - Run \`kvitton sync-journal\` to post the entries to {{PROVIDER}}
+4. **Sync to provider** - Run \`npx kvitton-cli sync-journal\` to post the entries to {{PROVIDER}}
 
 ## Tax Codes
 
@@ -9564,13 +9568,13 @@ async function uploadDocumentsForEntry(client2, storage2, absoluteDirPath, relat
     const { content } = await storage2.readFile(documentsYamlPath);
     existingDocs = parseYaml2(content) || [];
   } catch {}
-  const uploadedFiles = new Set(existingDocs.filter((d) => d.sourceIntegration === "bokio" && d.sourceId).map((d) => d.fileName));
+  const linkedFiles = new Set(existingDocs.filter((d) => d.sourceIntegration === "bokio" && d.linkedToJournalEntry).map((d) => d.fileName));
   for (const filename of files) {
     const ext = path6.extname(filename).toLowerCase();
     if (!UPLOADABLE_EXTENSIONS.includes(ext)) {
       continue;
     }
-    if (uploadedFiles.has(filename)) {
+    if (linkedFiles.has(filename)) {
       continue;
     }
     try {
@@ -9588,12 +9592,27 @@ async function uploadDocumentsForEntry(client2, storage2, absoluteDirPath, relat
         filename,
         journalEntryId
       });
-      existingDocs.push({
-        fileName: filename,
-        mimeType,
-        sourceIntegration: "bokio",
-        sourceId: upload.id
-      });
+      const existingDoc = existingDocs.find((d) => d.fileName === filename);
+      if (existingDoc) {
+        const previousSourceIds = [
+          ...existingDoc.previousSourceIds || [],
+          ...existingDoc.sourceId ? [existingDoc.sourceId] : []
+        ];
+        existingDoc.sourceId = upload.id;
+        existingDoc.sourceIntegration = "bokio";
+        existingDoc.linkedToJournalEntry = true;
+        if (previousSourceIds.length > 0) {
+          existingDoc.previousSourceIds = previousSourceIds;
+        }
+      } else {
+        existingDocs.push({
+          fileName: filename,
+          mimeType,
+          sourceIntegration: "bokio",
+          sourceId: upload.id,
+          linkedToJournalEntry: true
+        });
+      }
       await storage2.writeFile(documentsYamlPath, toYaml2(existingDocs));
       console.log(`    Uploaded file: ${filename}`);
     } catch (fileError) {
@@ -9796,7 +9815,7 @@ async function syncBokioInbox(cwd) {
   for (const upload of unprocessedUploads) {
     const slug = upload.description ? slugify4(upload.description) : upload.id.slice(0, 8);
     let dirName = `${today}-${slug}`;
-    const alreadyDownloaded = await isAlreadyDownloaded2(inboxDir, upload.id);
+    const alreadyDownloaded = await isAlreadyDownloaded2(cwd, upload.id);
     if (alreadyDownloaded) {
       existingCount++;
       continue;
@@ -9811,7 +9830,7 @@ async function syncBokioInbox(cwd) {
       await fs12.mkdir(uploadDir, { recursive: true });
       const result = await client2.downloadFile(upload.id);
       const ext = getExtensionFromContentType(upload.contentType || result.contentType);
-      const filename = upload.description ? `${slugify4(upload.description)}${ext}` : `document${ext}`;
+      const filename = upload.description ? `${slugify4(upload.description)}${ext}` : `${upload.id.slice(0, 8)}${ext}`;
       const filePath = path7.join(uploadDir, filename);
       const buffer = Buffer.from(result.data);
       await fs12.writeFile(filePath, buffer);
@@ -9861,22 +9880,37 @@ function getExtensionFromContentType(contentType) {
   };
   return map[contentType] || ".bin";
 }
-async function isAlreadyDownloaded2(inboxDir, sourceId) {
+async function isAlreadyDownloaded2(cwd, sourceId) {
+  const dirsToCheck = [
+    path7.join(cwd, "inbox"),
+    path7.join(cwd, "drafts")
+  ];
+  const journalEntriesDir = path7.join(cwd, "journal-entries");
   try {
-    const dirs = await fs12.readdir(inboxDir, { withFileTypes: true });
-    for (const dir of dirs) {
-      if (!dir.isDirectory())
-        continue;
-      const documentsPath = path7.join(inboxDir, dir.name, "documents.yaml");
-      try {
-        const content = await fs12.readFile(documentsPath, "utf-8");
-        const documents = parseYaml2(content);
-        if (documents?.some((doc) => doc.sourceId === sourceId)) {
-          return true;
-        }
-      } catch {}
+    const fyDirs = await fs12.readdir(journalEntriesDir, { withFileTypes: true });
+    for (const fyDir of fyDirs) {
+      if (fyDir.isDirectory() && fyDir.name.startsWith("FY-")) {
+        dirsToCheck.push(path7.join(journalEntriesDir, fyDir.name));
+      }
     }
   } catch {}
+  for (const baseDir of dirsToCheck) {
+    try {
+      const dirs = await fs12.readdir(baseDir, { withFileTypes: true });
+      for (const dir of dirs) {
+        if (!dir.isDirectory())
+          continue;
+        const documentsPath = path7.join(baseDir, dir.name, "documents.yaml");
+        try {
+          const content = await fs12.readFile(documentsPath, "utf-8");
+          const documents = parseYaml2(content);
+          if (documents?.some((doc) => doc.sourceId === sourceId || doc.previousSourceIds?.includes(sourceId))) {
+            return true;
+          }
+        } catch {}
+      }
+    } catch {}
+  }
   return false;
 }
 async function syncFortnoxInbox2(cwd) {
@@ -10095,14 +10129,15 @@ function getCachedRate(cwd, currency, date) {
   const key = makeCacheKey(currency, date);
   return cache2[key] ?? null;
 }
-function setCachedRate(cwd, currency, date, rate, rateDate) {
+function setCachedRates(cwd, currency, rates) {
+  if (rates.length === 0)
+    return;
   const cache2 = readCache(cwd);
-  const key = makeCacheKey(currency, date);
-  cache2[key] = {
-    rate,
-    rateDate,
-    cachedAt: new Date().toISOString()
-  };
+  const cachedAt = new Date().toISOString();
+  for (const { date, rate, rateDate } of rates) {
+    const key = makeCacheKey(currency, date);
+    cache2[key] = { rate, rateDate, cachedAt };
+  }
   writeCache(cwd, cache2);
 }
 
@@ -10110,6 +10145,18 @@ function setCachedRate(cwd, currency, date, rate, rateDate) {
 function getToday() {
   return new Date().toISOString().slice(0, 10);
 }
+function findClosestRate(observations, targetDate) {
+  const sorted2 = [...observations].sort((a, b) => b.date.localeCompare(a.date));
+  const match = sorted2.find((obs) => obs.date <= targetDate);
+  if (match) {
+    return { date: match.date, value: match.value };
+  }
+  const earliest = sorted2[sorted2.length - 1];
+  if (!earliest) {
+    throw new Error("No observations available");
+  }
+  return { date: earliest.date, value: earliest.value };
+}
 async function convertCurrencyCommand(options) {
   const cwd = process.cwd();
   const amount = parseFloat(options.amount);
@@ -10154,11 +10201,23 @@ async function convertCurrencyCommand(options) {
     rateDate = cached.rateDate;
     source = "CACHE";
   } else {
-    const result = await riksbank.getRate(currency, date);
-    rate = result.value;
-    rateDate = result.date;
+    const startDate = new Date(date);
+    startDate.setDate(startDate.getDate() - 7);
+    const fromDate = startDate.toISOString().slice(0, 10);
+    const observations = await riksbank.getObservations(currency, fromDate, date);
+    if (observations.length === 0) {
+      console.error(`Error: No rates found for ${currency} around ${date}`);
+      process.exit(1);
+    }
+    const closest = findClosestRate(observations, date);
+    rate = closest.value;
+    rateDate = closest.date;
     source = "RIKSBANK";
-    setCachedRate(cwd, currency, date, rate, rateDate);
+    setCachedRates(cwd, currency, observations.map((obs) => ({
+      date: obs.date,
+      rate: obs.value,
+      rateDate: obs.date
+    })));
   }
   const convertedAmount = amount * rate;
   console.log(`Exchange Rate: ${rate.toFixed(4)} SEK/${currency}`);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "kvitton-cli",
-	"version": "0.4.4",
+	"version": "0.4.6",
 	"description": "CLI for kvitton bookkeeping repositories",
 	"type": "module",
 	"bin": {