Fix all write commands and budget month offset (v0.4.1)

Author: Amram Englander

README.md

@@ -178,7 +178,6 @@ Commands that accept a `[month]` argument support:
 |--------|---------|-------------|
 | `current` | `riseup spending current` | Current budget month (default) |
 | `prev` | `riseup spending prev` | Previous month |
-| `-N` | `riseup spending -2` | N months back |
 | `YYYY-MM` | `riseup spending 2026-01` | Specific month |
 
 ## AI Agent Skills

package.json

@@ -1,6 +1,6 @@
 {
   "name": "riseup-cli",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Unofficial CLI for RiseUp personal finance, query your spending, income and balances from the terminal",
   "type": "module",
   "bin": {

src/cli.ts

@@ -27,7 +27,7 @@ const program = new Command();
 program
   .name("riseup")
   .description("Unofficial RiseUp Finance CLI")
-  .version("0.4.0");
+  .version("0.4.1");
 
 // Global options
 program.option("--json", "Output as JSON");

src/client/RiseUpClient.ts

@@ -95,26 +95,26 @@ export class RiseUpClient {
 
   /** Transaction write operations. */
   transactions = {
-    classify: (transactionId: string, expense: string, applyTo: "single" | "all" = "all") =>
-      this.http.post("/api/enrichment-update/save-enrichment", { transactionId, expense, applyTo }),
+    classify: (transactionId: string, businessName: string, expense: string, applyTo: "single" | "all" = "all") =>
+      this.http.postText("/api/enrichment-update/save-enrichment", { transactionId, businessName, expense, applyTo }),
 
-    rename: (transactionId: string, displayName: string, applyTo: "single" | "all" = "single") =>
-      this.http.post("/api/enrichment-update/save-enrichment", { transactionId, displayName, applyTo }),
+    rename: (transactionId: string, businessName: string, expense: string, applyTo: "single" | "all" = "single") =>
+      this.http.postText("/api/enrichment-update/save-enrichment", { transactionId, businessName, expense, applyTo }),
 
     comment: (transactionId: string, comment: string) =>
-      this.http.post("/api/enrichment-update/save-comments", { transactionId, comment }),
+      this.http.postText("/api/enrichment-update/save-comments", { transactionId, comment }),
 
     exclude: (transactionId: string) =>
-      this.http.post("/api/investigator/answers/budget-category", { transactionId, budgetCategory: "excluded" }),
+      this.http.postText("/api/investigator/answers/budget-category", { transactionId, budgetCategory: "excluded" }),
 
     include: (transactionId: string) =>
-      this.http.post("/api/investigator/answers/unexclude-transaction", { transactionId }),
+      this.http.postText("/api/investigator/answers/unexclude-transaction", { transactionId }),
 
     setBudgetType: (transactionId: string, budgetCategory: "fixed" | "variable") =>
-      this.http.post("/api/investigator/answers/budget-category", { transactionId, budgetCategory }),
+      this.http.postText("/api/investigator/answers/budget-category", { transactionId, budgetCategory }),
 
     merge: (transactionId: string, input: string = "approved") =>
-      this.http.post("/api/investigator/answers/merge", { papasMergeInput: [{ transactionId, input }] }),
+      this.http.postText("/api/investigator/answers/merge", { papasMergeInput: [{ transactionId, input }] }),
 
     adjustPrediction: (payload: {
       envelopeId: string;
@@ -124,7 +124,7 @@ export class RiseUpClient {
       isPermanent?: boolean;
       monthsAhead?: number;
     }) =>
-      this.http.post("/api/prediction-update/update-amount", {
+      this.http.postText("/api/prediction-update/update-amount", {
         ...payload,
         isPermanent: payload.isPermanent ?? true,
         monthsAhead: payload.monthsAhead ?? 1,
@@ -147,11 +147,19 @@ export class RiseUpClient {
 
   /**
    * Fetch budgets starting from a given date.
+   *
+   * The RiseUp API has a +1 month offset: requesting "2026-03" returns
+   * budgetDate "2026-02". We compensate here so callers get the month
+   * they actually asked for.
+   *
    * @param date  e.g. "2026-03"
    * @param count number of months to fetch (default 1)
    */
   async getBudgets(date: string, count = 1): Promise<Budget[]> {
-    return this.http.getJson<Budget[]>(`/api/budget/${date}/${count}`);
+    const [year, month] = date.split("-").map(Number);
+    const adjusted = new Date(year, month, 1); // month is already 1-based, so this adds +1
+    const apiDate = `${adjusted.getFullYear()}-${String(adjusted.getMonth() + 1).padStart(2, "0")}`;
+    return this.http.getJson<Budget[]>(`/api/budget/${apiDate}/${count}`);
   }
 
   /** Get the oldest budget date the user has (e.g. "2025-06"). */

src/client/types.ts

@@ -55,6 +55,7 @@ export interface Transaction {
   sequencerName?: string;
   modelScore?: number;
   aiEnrichment?: AiEnrichment;
+  customerComment?: string;
   accountNumberPiiValue?: string;
 }
 
@@ -439,7 +440,7 @@ export interface StoredSession {
 export interface SaveEnrichmentPayload {
   transactionId: string;
   expense?: string;
-  displayName?: string;
+  businessName?: string;
   applyTo?: "single" | "all";
 }
 

src/commands/manage.ts

@@ -1,13 +1,33 @@
 import chalk from "chalk";
 import type { Command } from "commander";
 import type { Transaction } from "../client/types.js";
+import type { RiseUpClient } from "../client/RiseUpClient.js";
 import { parseMonth } from "../utils/dates.js";
 import { formatNIS } from "../formatters/currency.js";
 import { createTable, printTable } from "../formatters/table.js";
 import { printJson } from "../formatters/json.js";
 import { withClient } from "./helpers.js";
 import { fetchBudgetTransactions } from "./budget-helpers.js";
 
+/**
+ * Search current and previous month budgets for a transaction by ID.
+ * Returns the Transaction if found, or null.
+ */
+async function findTransaction(
+  client: RiseUpClient,
+  transactionId: string,
+): Promise<Transaction | null> {
+  // Try current month first, then previous
+  for (const month of ["current", "prev"] as const) {
+    const date = parseMonth(month === "current" ? undefined : "prev");
+    const result = await fetchBudgetTransactions(client, date);
+    if (!result) continue;
+    const tx = result.transactions.find((t) => t.transactionId === transactionId);
+    if (tx) return tx;
+  }
+  return null;
+}
+
 // ── classify ────────────────────────────────
 
 export async function classifyAction(
@@ -21,7 +41,20 @@ export async function classifyAction(
   const applyTo = (opts.applyTo as "single" | "all") ?? "all";
 
   await withClient(async (client) => {
-    await client.transactions.classify(transactionId, category, applyTo);
+    // The save-enrichment API requires the businessName field.
+    const tx = await findTransaction(client, transactionId);
+    if (!tx) {
+      const msg = `Transaction ${transactionId} not found in current or previous month budgets.`;
+      if (json) {
+        printJson({ error: msg });
+      } else {
+        console.error(chalk.red(msg));
+      }
+      process.exitCode = 1;
+      return;
+    }
+
+    await client.transactions.classify(transactionId, tx.businessName, category, applyTo);
     if (json) {
       printJson({ success: true, transactionId, category, applyTo });
     } else {
@@ -43,9 +76,23 @@ export async function renameAction(
   const applyTo = (opts.applyTo as "single" | "all") ?? "single";
 
   await withClient(async (client) => {
-    await client.transactions.rename(transactionId, name, applyTo);
+    // The save-enrichment API requires the expense (category) field.
+    // Look up the transaction to get its current category.
+    const tx = await findTransaction(client, transactionId);
+    if (!tx) {
+      const msg = `Transaction ${transactionId} not found in current or previous month budgets.`;
+      if (json) {
+        printJson({ error: msg });
+      } else {
+        console.error(chalk.red(msg));
+      }
+      process.exitCode = 1;
+      return;
+    }
+
+    await client.transactions.rename(transactionId, name, tx.expense, applyTo);
     if (json) {
-      printJson({ success: true, transactionId, displayName: name, applyTo });
+      printJson({ success: true, transactionId, businessName: name, expense: tx.expense, applyTo });
     } else {
       console.log(chalk.green(`Transaction ${transactionId} renamed to "${name}" (apply: ${applyTo})`));
     }

src/commands/transactions.ts

@@ -82,12 +82,14 @@ export async function transactionsAction(
     if (json) {
       printJson(
         transactions.map((tx) => ({
+          transactionId: tx.transactionId,
           date: tx.transactionDate,
           amount: getDisplayAmount(tx),
           businessName: tx.businessName,
           category: tx.expense,
           source: tx.source,
           isIncome: tx.isIncome,
+          ...(tx.customerComment ? { comment: tx.customerComment } : {}),
         })),
       );
       return;

src/data/SKILL.md

@@ -114,7 +114,6 @@ Always use `--json` when you need to do custom analysis (e.g., finding subscript
 Commands accepting a month argument support:
 - `current` — current budget month (default)
 - `prev` — previous month
-- `-1`, `-2`, `-3` — relative months back
 - `2026-02` — specific year-month
 
 Data is available for approximately 10 months back.