@stephendolan/ynab-cli 2.8.0 → 2.8.2

package/dist/cli.js

@@ -429,7 +429,7 @@ var YnabClient = class {
     return this.api;
   }
   async getBudgetId(budgetIdOrDefault) {
-    const budgetId = budgetIdOrDefault || config.getDefaultBudget() || process.env.YNAB_BUDGET_ID;
+    const budgetId = (budgetIdOrDefault && budgetIdOrDefault !== "default" ? budgetIdOrDefault : void 0) || config.getDefaultBudget() || process.env.YNAB_BUDGET_ID;
     if (!budgetId) {
       throw new YnabCliError(
         'No budget specified. Use --budget flag, set default with "ynab budgets set-default", or set YNAB_BUDGET_ID environment variable',
@@ -438,338 +438,271 @@ var YnabClient = class {
     }
     return budgetId;
   }
-  async withErrorHandling(fn) {
-    try {
-      return await fn();
-    } catch (error) {
-      handleYnabError(error);
-    }
-  }
   async getUser() {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const response = await api.user.getUser();
-      return response.data.user;
-    });
+    const api = await this.getApi();
+    const response = await api.user.getUser();
+    return response.data.user;
   }
   async getBudgets(includeAccounts = false) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const response = await api.budgets.getBudgets(includeAccounts);
-      return {
-        budgets: response.data.budgets,
-        server_knowledge: 0
-      };
-    });
+    const api = await this.getApi();
+    const response = await api.budgets.getBudgets(includeAccounts);
+    return {
+      budgets: response.data.budgets,
+      server_knowledge: 0
+    };
   }
   async getBudget(budgetId, lastKnowledgeOfServer) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.budgets.getBudgetById(id, lastKnowledgeOfServer);
-      return {
-        budget: response.data.budget,
-        server_knowledge: response.data.server_knowledge
-      };
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.budgets.getBudgetById(id, lastKnowledgeOfServer);
+    return {
+      budget: response.data.budget,
+      server_knowledge: response.data.server_knowledge
+    };
   }
   async getBudgetSettings(budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.budgets.getBudgetSettingsById(id);
-      return response.data.settings;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.budgets.getBudgetSettingsById(id);
+    return response.data.settings;
   }
   async getAccounts(budgetId, lastKnowledgeOfServer) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.accounts.getAccounts(id, lastKnowledgeOfServer);
-      return {
-        accounts: response.data.accounts,
-        server_knowledge: response.data.server_knowledge
-      };
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.accounts.getAccounts(id, lastKnowledgeOfServer);
+    return {
+      accounts: response.data.accounts,
+      server_knowledge: response.data.server_knowledge
+    };
   }
   async getAccount(accountId, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.accounts.getAccountById(id, accountId);
-      return response.data.account;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.accounts.getAccountById(id, accountId);
+    return response.data.account;
   }
   async getCategories(budgetId, lastKnowledgeOfServer) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.categories.getCategories(id, lastKnowledgeOfServer);
-      return {
-        category_groups: response.data.category_groups,
-        server_knowledge: response.data.server_knowledge
-      };
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.categories.getCategories(id, lastKnowledgeOfServer);
+    return {
+      category_groups: response.data.category_groups,
+      server_knowledge: response.data.server_knowledge
+    };
   }
   async getCategory(categoryId, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.categories.getCategoryById(id, categoryId);
-      return response.data.category;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.categories.getCategoryById(id, categoryId);
+    return response.data.category;
   }
   async updateMonthCategory(month, categoryId, data, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.categories.updateMonthCategory(id, month, categoryId, data);
-      return response.data.category;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.categories.updateMonthCategory(id, month, categoryId, data);
+    return response.data.category;
   }
   async updateCategory(categoryId, data, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.categories.updateCategory(id, categoryId, data);
-      return response.data.category;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.categories.updateCategory(id, categoryId, data);
+    return response.data.category;
   }
   async getPayees(budgetId, lastKnowledgeOfServer) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.payees.getPayees(id, lastKnowledgeOfServer);
-      return {
-        payees: response.data.payees,
-        server_knowledge: response.data.server_knowledge
-      };
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.payees.getPayees(id, lastKnowledgeOfServer);
+    return {
+      payees: response.data.payees,
+      server_knowledge: response.data.server_knowledge
+    };
   }
   async getPayee(payeeId, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.payees.getPayeeById(id, payeeId);
-      return response.data.payee;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.payees.getPayeeById(id, payeeId);
+    return response.data.payee;
   }
   async updatePayee(payeeId, data, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.payees.updatePayee(id, payeeId, data);
-      return response.data.payee;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.payees.updatePayee(id, payeeId, data);
+    return response.data.payee;
   }
   async getPayeeLocationsByPayee(payeeId, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.payeeLocations.getPayeeLocationsByPayee(id, payeeId);
-      return response.data.payee_locations;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.payeeLocations.getPayeeLocationsByPayee(id, payeeId);
+    return response.data.payee_locations;
   }
   async getBudgetMonths(budgetId, lastKnowledgeOfServer) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.months.getBudgetMonths(id, lastKnowledgeOfServer);
-      return {
-        months: response.data.months,
-        server_knowledge: response.data.server_knowledge
-      };
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.months.getBudgetMonths(id, lastKnowledgeOfServer);
+    return {
+      months: response.data.months,
+      server_knowledge: response.data.server_knowledge
+    };
   }
   async getBudgetMonth(month, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.months.getBudgetMonth(id, month);
-      return response.data.month;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.months.getBudgetMonth(id, month);
+    return response.data.month;
   }
   async getTransactions(params) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(params.budgetId);
-      const response = await api.transactions.getTransactions(
-        id,
-        params.sinceDate,
-        params.type,
-        params.lastKnowledgeOfServer
-      );
-      return {
-        transactions: response.data.transactions,
-        server_knowledge: response.data.server_knowledge
-      };
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(params.budgetId);
+    const response = await api.transactions.getTransactions(
+      id,
+      params.sinceDate,
+      params.type,
+      params.lastKnowledgeOfServer
+    );
+    return {
+      transactions: response.data.transactions,
+      server_knowledge: response.data.server_knowledge
+    };
   }
   async getTransactionsByAccount(accountId, params) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(params.budgetId);
-      const response = await api.transactions.getTransactionsByAccount(
-        id,
-        accountId,
-        params.sinceDate,
-        params.type,
-        params.lastKnowledgeOfServer
-      );
-      return {
-        transactions: response.data.transactions,
-        server_knowledge: response.data.server_knowledge
-      };
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(params.budgetId);
+    const response = await api.transactions.getTransactionsByAccount(
+      id,
+      accountId,
+      params.sinceDate,
+      params.type,
+      params.lastKnowledgeOfServer
+    );
+    return {
+      transactions: response.data.transactions,
+      server_knowledge: response.data.server_knowledge
+    };
   }
   async getTransactionsByCategory(categoryId, params) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(params.budgetId);
-      const response = await api.transactions.getTransactionsByCategory(
-        id,
-        categoryId,
-        params.sinceDate,
-        params.type,
-        params.lastKnowledgeOfServer
-      );
-      return {
-        transactions: response.data.transactions,
-        server_knowledge: response.data.server_knowledge
-      };
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(params.budgetId);
+    const response = await api.transactions.getTransactionsByCategory(
+      id,
+      categoryId,
+      params.sinceDate,
+      params.type,
+      params.lastKnowledgeOfServer
+    );
+    return {
+      transactions: response.data.transactions,
+      server_knowledge: response.data.server_knowledge
+    };
   }
   async getTransactionsByPayee(payeeId, params) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(params.budgetId);
-      const response = await api.transactions.getTransactionsByPayee(
-        id,
-        payeeId,
-        params.sinceDate,
-        params.type,
-        params.lastKnowledgeOfServer
-      );
-      return {
-        transactions: response.data.transactions,
-        server_knowledge: response.data.server_knowledge
-      };
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(params.budgetId);
+    const response = await api.transactions.getTransactionsByPayee(
+      id,
+      payeeId,
+      params.sinceDate,
+      params.type,
+      params.lastKnowledgeOfServer
+    );
+    return {
+      transactions: response.data.transactions,
+      server_knowledge: response.data.server_knowledge
+    };
   }
   async getTransaction(transactionId, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.transactions.getTransactionById(id, transactionId);
-      return response.data.transaction;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.transactions.getTransactionById(id, transactionId);
+    return response.data.transaction;
   }
   async createTransaction(transactionData, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.transactions.createTransaction(id, transactionData);
-      return response.data.transaction;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.transactions.createTransaction(id, transactionData);
+    return response.data.transaction;
   }
   async updateTransaction(transactionId, transactionData, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.transactions.updateTransaction(id, transactionId, transactionData);
-      return response.data.transaction;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.transactions.updateTransaction(id, transactionId, transactionData);
+    return response.data.transaction;
   }
   async updateTransactions(transactions, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.transactions.updateTransactions(id, transactions);
-      return {
-        transactions: response.data.transactions,
-        transaction_ids: response.data.transaction_ids,
-        server_knowledge: response.data.server_knowledge
-      };
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.transactions.updateTransactions(id, transactions);
+    return {
+      transactions: response.data.transactions,
+      transaction_ids: response.data.transaction_ids,
+      server_knowledge: response.data.server_knowledge
+    };
   }
   async deleteTransaction(transactionId, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.transactions.deleteTransaction(id, transactionId);
-      return response.data.transaction;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.transactions.deleteTransaction(id, transactionId);
+    return response.data.transaction;
   }
   async importTransactions(budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.transactions.importTransactions(id);
-      return response.data.transaction_ids;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.transactions.importTransactions(id);
+    return response.data.transaction_ids;
   }
   async getScheduledTransactions(budgetId, lastKnowledgeOfServer) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.scheduledTransactions.getScheduledTransactions(
-        id,
-        lastKnowledgeOfServer
-      );
-      return {
-        scheduled_transactions: response.data.scheduled_transactions,
-        server_knowledge: response.data.server_knowledge
-      };
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.scheduledTransactions.getScheduledTransactions(
+      id,
+      lastKnowledgeOfServer
+    );
+    return {
+      scheduled_transactions: response.data.scheduled_transactions,
+      server_knowledge: response.data.server_knowledge
+    };
   }
   async getScheduledTransaction(scheduledTransactionId, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.scheduledTransactions.getScheduledTransactionById(
-        id,
-        scheduledTransactionId
-      );
-      return response.data.scheduled_transaction;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.scheduledTransactions.getScheduledTransactionById(
+      id,
+      scheduledTransactionId
+    );
+    return response.data.scheduled_transaction;
   }
   async deleteScheduledTransaction(scheduledTransactionId, budgetId) {
-    return this.withErrorHandling(async () => {
-      const api = await this.getApi();
-      const id = await this.getBudgetId(budgetId);
-      const response = await api.scheduledTransactions.deleteScheduledTransaction(
-        id,
-        scheduledTransactionId
-      );
-      return response.data.scheduled_transaction;
-    });
+    const api = await this.getApi();
+    const id = await this.getBudgetId(budgetId);
+    const response = await api.scheduledTransactions.deleteScheduledTransaction(
+      id,
+      scheduledTransactionId
+    );
+    return response.data.scheduled_transaction;
   }
   async rawApiCall(method, path, data, budgetId) {
-    return this.withErrorHandling(async () => {
-      await this.getApi();
-      const fullPath = path.includes("{budget_id}") ? path.replace("{budget_id}", await this.getBudgetId(budgetId)) : path;
-      const url = `https://api.ynab.com/v1${fullPath}`;
-      const accessToken = await auth.getAccessToken() || process.env.YNAB_API_KEY;
-      const headers = {
-        Authorization: `Bearer ${accessToken}`,
-        "Content-Type": "application/json"
-      };
-      const httpMethod = method.toUpperCase();
-      const hasBody = ["POST", "PUT", "PATCH"].includes(httpMethod);
-      if (!["GET", "POST", "PUT", "PATCH", "DELETE"].includes(httpMethod)) {
-        throw new YnabCliError(`Unsupported HTTP method: ${method}`, 400);
-      }
-      const response = await fetch(url, {
-        method: httpMethod,
-        headers,
-        ...hasBody && { body: JSON.stringify(data) }
-      });
-      if (!response.ok) {
-        const errorData = await response.json();
-        throw { error: sanitizeApiError(errorData.error || errorData) };
-      }
-      return await response.json();
+    await this.getApi();
+    const fullPath = path.includes("{budget_id}") ? path.replace("{budget_id}", await this.getBudgetId(budgetId)) : path;
+    const url = `https://api.ynab.com/v1${fullPath}`;
+    const accessToken = await auth.getAccessToken() || process.env.YNAB_API_KEY;
+    const headers = {
+      Authorization: `Bearer ${accessToken}`,
+      "Content-Type": "application/json"
+    };
+    const httpMethod = method.toUpperCase();
+    const hasBody = ["POST", "PUT", "PATCH"].includes(httpMethod);
+    if (!["GET", "POST", "PUT", "PATCH", "DELETE"].includes(httpMethod)) {
+      throw new YnabCliError(`Unsupported HTTP method: ${method}`, 400);
+    }
+    const response = await fetch(url, {
+      method: httpMethod,
+      headers,
+      ...hasBody && { body: JSON.stringify(data) }
     });
+    if (!response.ok) {
+      const errorData = await response.json();
+      throw { error: sanitizeApiError(errorData.error || errorData) };
+    }
+    return await response.json();
   }
 };
 var client = new YnabClient();
@@ -1635,6 +1568,37 @@ var server = new McpServer({
   name: "ynab",
   version: "1.0.0"
 });
+function mcpErrorResult(error) {
+  let errorBody;
+  if (typeof error === "object" && error !== null && "error" in error) {
+    const apiError = sanitizeApiError(error.error);
+    errorBody = { name: apiError.name, detail: apiError.detail };
+  } else if (error instanceof YnabCliError) {
+    errorBody = { name: "cli_error", detail: sanitizeErrorMessage(error.message) };
+  } else if (error instanceof Error) {
+    errorBody = { name: error.name, detail: sanitizeErrorMessage(error.message) };
+  } else {
+    errorBody = { name: "unknown_error", detail: "An unexpected error occurred" };
+  }
+  return {
+    content: [{ type: "text", text: JSON.stringify({ error: errorBody }) }],
+    isError: true
+  };
+}
+var _serverTool = server.tool.bind(server);
+server.tool = (...args) => {
+  const handler = args[args.length - 1];
+  if (typeof handler === "function") {
+    args[args.length - 1] = async (...handlerArgs) => {
+      try {
+        return await handler(...handlerArgs);
+      } catch (error) {
+        return mcpErrorResult(error);
+      }
+    };
+  }
+  return _serverTool.apply(null, args);
+};
 function jsonResponse(data) {
   return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
 }
@@ -2080,7 +2044,7 @@ function createMcpCommand() {
 
 // src/cli.ts
 var program = new Command12();
-program.name("ynab").description("A command-line interface for You Need a Budget (YNAB)").version("2.8.0").option("-c, --compact", "Minified JSON output (single line)").hook("preAction", (thisCommand) => {
+program.name("ynab").description("A command-line interface for You Need a Budget (YNAB)").version("2.8.2").option("-c, --compact", "Minified JSON output (single line)").hook("preAction", (thisCommand) => {
   const options = thisCommand.opts();
   setOutputOptions({
     compact: options.compact