@actual-app/api 6.8.0 → 6.8.2

package/@types/loot-core/client/state-types/modals.d.ts

@@ -4,6 +4,7 @@ import type {
   CategoryEntity,
   CategoryGroupEntity,
   GoCardlessToken,
+  TransactionEntity,
 } from '../../types/models';
 import type { NewRuleEntity, RuleEntity } from '../../types/models/rule';
 import type { EmptyObject, StripNever } from '../../types/util';
@@ -121,7 +122,7 @@ type FinanceModals = {
     month: string;
   };
 
-  'schedule-edit': { id: string } | null;
+  'schedule-edit': { id: string; transaction?: TransactionEntity } | null;
 
   'schedule-link': { transactionIds: string[] } | null;
 
@@ -201,6 +202,7 @@ type FinanceModals = {
   'rollover-summary-to-budget-menu': {
     month: string;
     onTransfer: () => void;
+    onCover: () => void;
     onHoldBuffer: () => void;
     onResetHoldBuffer: () => void;
   };
@@ -217,8 +219,9 @@ type FinanceModals = {
     showToBeBudgeted?: boolean;
   };
   cover: {
-    categoryId: string;
+    title: string;
     month: string;
+    showToBeBudgeted?: boolean;
     onSubmit: (fromCategoryId: string) => void;
   };
   'hold-buffer': {

package/@types/loot-core/platform/server/sqlite/index.d.ts

@@ -1,10 +1,10 @@
-import { type Database } from 'better-sqlite3';
+import { type Database } from '@jlongster/sql.js';
 
-export async function init(): unknown;
+export async function init(): Promise<void>;
 
 export function _getModule(): SqlJsStatic;
 
-export function prepare(db, sql): unknown;
+export function prepare(db: Database, sql: string): string;
 
 export function runQuery(
   db: Database,

package/@types/loot-core/server/accounts/transactions.d.ts

@@ -1,20 +1,8 @@
-import { TransactionEntity } from '../../types/models';
+import { NewTransactionEntity, TransactionEntity } from '../../types/models';
 export declare function batchUpdateTransactions({ added, deleted, updated, learnCategories, detectOrphanPayees, runTransfers, }: {
-    added?: Array<{
-        id: string;
-        payee: unknown;
-        category: unknown;
-    }>;
-    deleted?: Array<{
-        id: string;
-        payee: unknown;
-    }>;
-    updated?: Array<{
-        id: string;
-        payee?: unknown;
-        account?: unknown;
-        category?: unknown;
-    }>;
+    added?: Array<Partial<NewTransactionEntity | TransactionEntity>>;
+    deleted?: Array<Partial<NewTransactionEntity | TransactionEntity>>;
+    updated?: Array<Partial<NewTransactionEntity | TransactionEntity>>;
     learnCategories?: boolean;
     detectOrphanPayees?: boolean;
     runTransfers?: boolean;

package/@types/loot-core/server/aql/schema/index.d.ts

@@ -271,6 +271,9 @@ export declare const schema: {
         show_uncategorized: {
             type: string;
         };
+        include_current: {
+            type: string;
+        };
         selected_categories: {
             type: string;
         };

package/@types/loot-core/server/budget/actions.d.ts

@@ -50,6 +50,10 @@ export declare function transferAvailable({ month, amount, category, }: {
     amount: number;
     category: string;
 }): Promise<void>;
+export declare function coverOverbudgeted({ month, category, }: {
+    month: string;
+    category: string;
+}): Promise<void>;
 export declare function transferCategory({ month, amount, from, to, }: {
     month: string;
     amount: number;

package/@types/loot-core/server/budget/app.d.ts

@@ -4,7 +4,7 @@ export declare const app: {
     handlers: BudgetHandlers;
     services: any;
     unlistenServices: any;
-    method<Name extends "budget/budget-amount" | "budget/copy-previous-month" | "budget/set-zero" | "budget/set-3month-avg" | "budget/check-templates" | "budget/apply-goal-template" | "budget/overwrite-goal-template" | "budget/cleanup-goal-template" | "budget/hold-for-next-month" | "budget/reset-hold" | "budget/cover-overspending" | "budget/transfer-available" | "budget/transfer-category" | "budget/set-carryover" | "budget/apply-single-template" | "budget/set-n-month-avg" | "budget/copy-single-month">(name: Name, func: BudgetHandlers[Name]): void;
+    method<Name extends "budget/budget-amount" | "budget/copy-previous-month" | "budget/set-zero" | "budget/set-3month-avg" | "budget/check-templates" | "budget/apply-goal-template" | "budget/overwrite-goal-template" | "budget/cleanup-goal-template" | "budget/hold-for-next-month" | "budget/reset-hold" | "budget/cover-overspending" | "budget/transfer-available" | "budget/cover-overbudgeted" | "budget/transfer-category" | "budget/set-carryover" | "budget/apply-single-template" | "budget/set-n-month-avg" | "budget/copy-single-month">(name: Name, func: BudgetHandlers[Name]): void;
     service(func: any): void;
     combine(...apps: any[]): void;
     startServices(): void;

package/@types/loot-core/server/budget/types/handlers.d.ts

@@ -46,6 +46,11 @@ export interface BudgetHandlers {
     category: string;
   }) => Promise<void>;
 
+  'budget/cover-overbudgeted': (arg: {
+    month: string;
+    category: string;
+  }) => Promise<void>;
+
   'budget/transfer-category': (arg: {
     month: string;
     amount: number;

package/@types/loot-core/server/db/index.d.ts

@@ -1,16 +1,56 @@
+import { Database } from '@jlongster/sql.js';
 import { CategoryEntity, CategoryGroupEntity } from '../../types/models';
 export { toDateRepr, fromDateRepr } from '../models';
-export declare function getDatabasePath(): any;
-export declare function openDatabase(id?: any): Promise<void>;
-export declare function reopenDatabase(): Promise<void>;
+export declare function getDatabasePath(): string;
+export declare function openDatabase(id?: string): Promise<void>;
 export declare function closeDatabase(): Promise<void>;
-export declare function setDatabase(db_: any): void;
-export declare function getDatabase(): any;
+export declare function setDatabase(db_: Database): void;
+export declare function getDatabase(): {
+    close(): void;
+    create_function(name: string, func: (...args: any[]) => any): any;
+    each(sql: string, params: import("@jlongster/sql.js").BindParams, callback: import("@jlongster/sql.js").ParamsCallback, done: () => void): any;
+    each(sql: string, callback: import("@jlongster/sql.js").ParamsCallback, done: () => void): any;
+    exec(sql: string, params?: import("@jlongster/sql.js").BindParams): import("@jlongster/sql.js").QueryExecResult[];
+    export(): Uint8Array;
+    getRowsModified(): number;
+    handleError(): null;
+    iterateStatements(sql: string): {
+        getRemainingSql(): string;
+        next(): import("@jlongster/sql.js").StatementIteratorResult;
+        [Symbol.iterator](): Iterator<{
+            bind(values?: import("@jlongster/sql.js").BindParams): boolean;
+            free(): boolean;
+            freemem(): void;
+            get(params?: import("@jlongster/sql.js").BindParams): import("@jlongster/sql.js").SqlValue[];
+            getAsObject(params?: import("@jlongster/sql.js").BindParams): import("@jlongster/sql.js").ParamsObject;
+            getColumnNames(): string[];
+            getNormalizedSQL(): string;
+            getSQL(): string;
+            reset(): void;
+            run(values?: import("@jlongster/sql.js").BindParams): void;
+            step(): boolean;
+        }, any, undefined>;
+    };
+    prepare(sql: string, params?: import("@jlongster/sql.js").BindParams): {
+        bind(values?: import("@jlongster/sql.js").BindParams): boolean;
+        free(): boolean;
+        freemem(): void;
+        get(params?: import("@jlongster/sql.js").BindParams): import("@jlongster/sql.js").SqlValue[];
+        getAsObject(params?: import("@jlongster/sql.js").BindParams): import("@jlongster/sql.js").ParamsObject;
+        getColumnNames(): string[];
+        getNormalizedSQL(): string;
+        getSQL(): string;
+        reset(): void;
+        run(values?: import("@jlongster/sql.js").BindParams): void;
+        step(): boolean;
+    };
+    run(sql: string, params?: import("@jlongster/sql.js").BindParams): any;
+};
 export declare function loadClock(): Promise<void>;
 export declare function runQuery(sql: string, params?: Array<string | number>, fetchAll?: false): any;
 export declare function runQuery(sql: string, params: Array<string | number> | undefined, fetchAll: true): any;
-export declare function execQuery(sql: any): void;
-export declare function cache(sql: any): any;
+export declare function execQuery(sql: string): void;
+export declare function cache(sql: string): any;
 export declare function transaction(fn: () => void): void;
 export declare function asyncTransaction(fn: () => Promise<void>): Promise<void>;
 export declare function all(sql: any, params?: (string | number)[]): Promise<any>;

package/@types/loot-core/server/main-app.d.ts

@@ -4,7 +4,7 @@ export declare const app: {
     handlers: Handlers;
     services: any;
     unlistenServices: any;
-    method<Name extends "transaction-update" | "undo" | "redo" | "transactions-batch-update" | "transaction-add" | "transaction-delete" | "transactions-parse-file" | "transactions-export" | "transactions-export-query" | "get-categories" | "get-earliest-transaction" | "get-budget-bounds" | "rollover-budget-month" | "report-budget-month" | "budget-set-type" | "category-create" | "category-update" | "category-move" | "category-delete" | "category-group-create" | "category-group-update" | "category-group-move" | "category-group-delete" | "must-category-transfer" | "payee-create" | "payees-get" | "payees-get-rule-counts" | "payees-merge" | "payees-batch-change" | "payees-check-orphaned" | "payees-get-rules" | "make-filters-from-conditions" | "getCell" | "getCells" | "getCellNamesInSheet" | "debugCell" | "create-query" | "query" | "account-update" | "accounts-get" | "account-properties" | "gocardless-accounts-link" | "simplefin-accounts-link" | "account-create" | "account-close" | "account-reopen" | "account-move" | "secret-set" | "secret-check" | "gocardless-poll-web-token" | "gocardless-status" | "simplefin-status" | "simplefin-accounts" | "gocardless-get-banks" | "gocardless-poll-web-token-stop" | "gocardless-create-web-token" | "accounts-bank-sync" | "transactions-import" | "account-unlink" | "save-global-prefs" | "load-global-prefs" | "save-prefs" | "load-prefs" | "sync-reset" | "sync-repair" | "key-make" | "key-test" | "get-did-bootstrap" | "subscribe-needs-bootstrap" | "subscribe-bootstrap" | "subscribe-get-user" | "subscribe-change-password" | "subscribe-sign-in" | "subscribe-sign-out" | "get-server-version" | "get-server-url" | "set-server-url" | "sync" | "get-budgets" | "get-remote-files" | "reset-budget-cache" | "upload-budget" | "download-budget" | "sync-budget" | "load-budget" | "create-demo-budget" | "close-budget" | "delete-budget" | "create-budget" | "import-budget" | "export-budget" | "upload-file-web" | "backups-get" | "backup-load" | "backup-make" | "get-last-opened-backup" | "app-focused" | "api/batch-budget-start" | "api/batch-budget-end" | "api/load-budget" | "api/download-budget" | "api/start-import" | "api/finish-import" | "api/abort-import" | "api/query" | "api/budget-months" | "api/budget-month" | "api/budget-set-amount" | "api/budget-set-carryover" | "api/transactions-export" | "api/transactions-import" | "api/transactions-add" | "api/transactions-get" | "api/transaction-update" | "api/transaction-delete" | "api/sync" | "api/bank-sync" | "api/accounts-get" | "api/account-create" | "api/account-update" | "api/account-close" | "api/account-reopen" | "api/account-delete" | "api/categories-get" | "api/category-groups-get" | "api/category-group-create" | "api/category-group-update" | "api/category-group-delete" | "api/category-create" | "api/category-update" | "api/category-delete" | "api/payees-get" | "api/payee-create" | "api/payee-update" | "api/payee-delete" | "api/rules-get" | "api/payee-rules-get" | "api/rule-create" | "api/rule-update" | "api/rule-delete" | "budget/budget-amount" | "budget/copy-previous-month" | "budget/set-zero" | "budget/set-3month-avg" | "budget/check-templates" | "budget/apply-goal-template" | "budget/overwrite-goal-template" | "budget/cleanup-goal-template" | "budget/hold-for-next-month" | "budget/reset-hold" | "budget/cover-overspending" | "budget/transfer-available" | "budget/transfer-category" | "budget/set-carryover" | "budget/apply-single-template" | "budget/set-n-month-avg" | "budget/copy-single-month" | "filter-create" | "filter-update" | "filter-delete" | "notes-save" | "report/create" | "report/update" | "report/delete" | "rule-validate" | "rule-add" | "rule-update" | "rule-delete" | "rule-delete-all" | "rule-apply-actions" | "rule-add-payee-rename" | "rules-get" | "rule-get" | "rules-run" | "schedule/create" | "schedule/update" | "schedule/delete" | "schedule/skip-next-date" | "schedule/post-transaction" | "schedule/force-run-service" | "schedule/discover" | "schedule/get-upcoming-dates" | "tools/fix-split-transactions">(name: Name, func: Handlers[Name]): void;
+    method<Name extends "transaction-update" | "undo" | "redo" | "transactions-batch-update" | "transaction-add" | "transaction-delete" | "transactions-parse-file" | "transactions-export" | "transactions-export-query" | "get-categories" | "get-earliest-transaction" | "get-budget-bounds" | "rollover-budget-month" | "report-budget-month" | "budget-set-type" | "category-create" | "category-update" | "category-move" | "category-delete" | "category-group-create" | "category-group-update" | "category-group-move" | "category-group-delete" | "must-category-transfer" | "payee-create" | "payees-get" | "payees-get-rule-counts" | "payees-merge" | "payees-batch-change" | "payees-check-orphaned" | "payees-get-rules" | "make-filters-from-conditions" | "getCell" | "getCells" | "getCellNamesInSheet" | "debugCell" | "create-query" | "query" | "account-update" | "accounts-get" | "account-properties" | "gocardless-accounts-link" | "simplefin-accounts-link" | "account-create" | "account-close" | "account-reopen" | "account-move" | "secret-set" | "secret-check" | "gocardless-poll-web-token" | "gocardless-status" | "simplefin-status" | "simplefin-accounts" | "gocardless-get-banks" | "gocardless-poll-web-token-stop" | "gocardless-create-web-token" | "accounts-bank-sync" | "transactions-import" | "account-unlink" | "save-global-prefs" | "load-global-prefs" | "save-prefs" | "load-prefs" | "sync-reset" | "sync-repair" | "key-make" | "key-test" | "get-did-bootstrap" | "subscribe-needs-bootstrap" | "subscribe-bootstrap" | "subscribe-get-user" | "subscribe-change-password" | "subscribe-sign-in" | "subscribe-sign-out" | "get-server-version" | "get-server-url" | "set-server-url" | "sync" | "get-budgets" | "get-remote-files" | "reset-budget-cache" | "upload-budget" | "download-budget" | "sync-budget" | "load-budget" | "create-demo-budget" | "close-budget" | "delete-budget" | "create-budget" | "import-budget" | "export-budget" | "upload-file-web" | "backups-get" | "backup-load" | "backup-make" | "get-last-opened-backup" | "app-focused" | "api/batch-budget-start" | "api/batch-budget-end" | "api/load-budget" | "api/download-budget" | "api/start-import" | "api/finish-import" | "api/abort-import" | "api/query" | "api/budget-months" | "api/budget-month" | "api/budget-set-amount" | "api/budget-set-carryover" | "api/transactions-export" | "api/transactions-import" | "api/transactions-add" | "api/transactions-get" | "api/transaction-update" | "api/transaction-delete" | "api/sync" | "api/bank-sync" | "api/accounts-get" | "api/account-create" | "api/account-update" | "api/account-close" | "api/account-reopen" | "api/account-delete" | "api/categories-get" | "api/category-groups-get" | "api/category-group-create" | "api/category-group-update" | "api/category-group-delete" | "api/category-create" | "api/category-update" | "api/category-delete" | "api/payees-get" | "api/payee-create" | "api/payee-update" | "api/payee-delete" | "api/rules-get" | "api/payee-rules-get" | "api/rule-create" | "api/rule-update" | "api/rule-delete" | "budget/budget-amount" | "budget/copy-previous-month" | "budget/set-zero" | "budget/set-3month-avg" | "budget/check-templates" | "budget/apply-goal-template" | "budget/overwrite-goal-template" | "budget/cleanup-goal-template" | "budget/hold-for-next-month" | "budget/reset-hold" | "budget/cover-overspending" | "budget/transfer-available" | "budget/cover-overbudgeted" | "budget/transfer-category" | "budget/set-carryover" | "budget/apply-single-template" | "budget/set-n-month-avg" | "budget/copy-single-month" | "filter-create" | "filter-update" | "filter-delete" | "notes-save" | "report/create" | "report/update" | "report/delete" | "rule-validate" | "rule-add" | "rule-update" | "rule-delete" | "rule-delete-all" | "rule-apply-actions" | "rule-add-payee-rename" | "rules-get" | "rule-get" | "rules-run" | "schedule/create" | "schedule/update" | "schedule/delete" | "schedule/skip-next-date" | "schedule/post-transaction" | "schedule/force-run-service" | "schedule/discover" | "schedule/get-upcoming-dates" | "tools/fix-split-transactions">(name: Name, func: Handlers[Name]): void;
     service(func: any): void;
     combine(...apps: any[]): void;
     startServices(): void;

package/@types/loot-core/server/migrate/migrations.d.ts

@@ -1,4 +1,4 @@
-import { Database } from 'better-sqlite3';
+import { Database } from '@jlongster/sql.js';
 export declare function withMigrationsDir(dir: string, func: () => Promise<void>): Promise<void>;
 export declare function getMigrationsDir(): string;
 export declare function getUpMigration(id: any, names: any): any;

package/@types/loot-core/server/post.d.ts

@@ -1,3 +1,3 @@
-export declare function post(url: any, data: any, headers?: {}): Promise<any>;
+export declare function post(url: any, data: any, headers?: {}, timeout?: any): Promise<any>;
 export declare function postBinary(url: any, data: any, headers: any): Promise<any>;
 export declare function get(url: any, opts?: any): Promise<string>;

package/@types/loot-core/shared/rules.d.ts

@@ -31,7 +31,7 @@ export declare const ALLOCATION_METHODS: {
     remainder: string;
 };
 export declare function mapField(field: any, opts?: any): any;
-export declare function friendlyOp(op: any, type?: any): "" | "is" | "contains" | "one of" | "not one of" | "is not" | "is approx" | "is between" | "does not contain" | "is after" | "is greater than" | "is after or equals" | "is greater than or equals" | "is before" | "is less than" | "is before or equals" | "is less than or equals" | "is true" | "is false" | "set" | "allocate" | "link schedule" | "and" | "or";
+export declare function friendlyOp(op: any, type?: any): "" | "is" | "contains" | "matches" | "one of" | "not one of" | "is not" | "is approx" | "is between" | "does not contain" | "is after" | "is greater than" | "is after or equals" | "is greater than or equals" | "is before" | "is less than" | "is before or equals" | "is less than or equals" | "is true" | "is false" | "set" | "allocate" | "link schedule" | "and" | "or";
 export declare function deserializeField(field: any): {
     field: string;
     options: {

package/@types/loot-core/shared/transactions.d.ts

@@ -12,7 +12,7 @@ declare function SplitTransactionError(total: number, parent: TransactionEntity)
     difference: number;
 };
 type GenericTransactionEntity = NewTransactionEntity | TransactionEntity | TransactionEntityWithError;
-export declare function makeChild<T extends GenericTransactionEntity>(parent: T, data: object): T;
+export declare function makeChild<T extends GenericTransactionEntity>(parent: T, data?: object): T;
 export declare function recalculateSplit(trans: TransactionEntity): TransactionEntityWithError;
 export declare function ungroupTransactions(transactions: TransactionEntity[]): TransactionEntity[];
 export declare function groupTransaction(split: TransactionEntity[]): TransactionEntity;
@@ -54,7 +54,7 @@ export declare function deleteTransaction(transactions: TransactionEntity[], id:
     newTransaction: TransactionEntityWithError | TransactionEntity;
     diff: any;
 };
-export declare function splitTransaction(transactions: TransactionEntity[], id: string): {
+export declare function splitTransaction(transactions: TransactionEntity[], id: string, createSubtransactions?: (parentTransaction: TransactionEntity) => TransactionEntity[]): {
     data: any[];
     diff: {
         deleted: any[];
@@ -88,4 +88,29 @@ export declare function realizeTempTransactions(transactions: TransactionEntity[
     starting_balance_flag?: boolean;
     transfer_id?: string;
 }[];
+export declare function makeAsNonChildTransactions(childTransactionsToUpdate: TransactionEntity[], transactions: TransactionEntity[]): {
+    updated: TransactionEntity[];
+    deleted: {
+        amount: number;
+        id: string;
+        account: import("../types/models").AccountEntity;
+        category?: import("../types/models").CategoryEntity;
+        payee?: import("../types/models").PayeeEntity;
+        schedule?: import("../types/models").ScheduleEntity;
+        subtransactions?: TransactionEntity[];
+        sort_order?: number;
+        tombstone?: boolean;
+        imported_payee?: string;
+        date: string;
+        notes?: string;
+        cleared?: boolean;
+        reconciled?: boolean;
+        is_parent?: boolean;
+        is_child?: boolean;
+        parent_id?: string;
+        imported_id?: string;
+        starting_balance_flag?: boolean;
+        transfer_id?: string;
+    }[];
+};
 export {};

package/@types/loot-core/types/models/reports.d.ts

@@ -15,6 +15,7 @@ export interface CustomReportEntity {
   showEmpty: boolean;
   showOffBudget: boolean;
   showHiddenCategories: boolean;
+  includeCurrentInterval: boolean;
   showUncategorized: boolean;
   selectedCategories?: CategoryEntity[];
   graphType: string;
@@ -24,6 +25,13 @@ export interface CustomReportEntity {
   tombstone?: boolean;
 }
 
+export type balanceTypeOpType =
+  | 'totalAssets'
+  | 'totalDebts'
+  | 'totalTotals'
+  | 'netAssets'
+  | 'netDebts';
+
 export type SpendingMonthEntity = Record<
   string | number,
   {
@@ -49,6 +57,7 @@ export interface SpendingEntity {
     average: number;
     thisMonth: number;
     lastMonth: number;
+    lastYear: number;
   }[];
   startDate?: string;
   endDate?: string;
@@ -66,6 +75,8 @@ export interface DataEntity {
   endDate?: string;
   totalDebts: number;
   totalAssets: number;
+  netAssets: number;
+  netDebts: number;
   totalTotals: number;
 }
 
@@ -79,8 +90,11 @@ export type IntervalEntity = {
   date?: string;
   change?: number;
   intervalStartDate?: string;
+  intervalEndDate?: string;
   totalAssets: number;
   totalDebts: number;
+  netAssets: number;
+  netDebts: number;
   totalTotals: number;
 };
 
@@ -92,6 +106,8 @@ export interface GroupedEntity {
   totalAssets: number;
   totalDebts: number;
   totalTotals: number;
+  netAssets: number;
+  netDebts: number;
   categories?: GroupedEntity[];
 }
 
@@ -112,6 +128,7 @@ export interface CustomReportData {
   show_empty: number;
   show_offbudget: number;
   show_hidden: number;
+  include_current: number;
   show_uncategorized: number;
   selected_categories?: CategoryEntity[];
   graph_type: string;

package/@types/loot-core/types/models/rule.d.ts

@@ -24,7 +24,8 @@ export type RuleConditionOp =
   | 'lt'
   | 'lte'
   | 'contains'
-  | 'doesNotContain';
+  | 'doesNotContain'
+  | 'matches';
 
 export interface RuleConditionEntity {
   field?: string;

package/@types/loot-core/types/prefs.d.ts

@@ -3,10 +3,9 @@ import { type numberFormats } from '../shared/util';
 export type FeatureFlag =
   | 'reportBudget'
   | 'goalTemplatesEnabled'
-  | 'customReports'
   | 'spendingReport'
   | 'simpleFinSync'
-  | 'splitsInRules';
+  | 'iterableTopologicalSort';
 
 export type LocalPrefs = Partial<
   {

package/@types/loot-core/types/server-handlers.d.ts

@@ -32,7 +32,7 @@ export interface ServerHandlers {
       Parameters<typeof batchUpdateTransactions>[0],
       'detectOrphanPayees'
     >,
-  ) => Promise<Awaited<ReturnType<typeof batchUpdateTransactions>>['updated']>;
+  ) => Promise<Awaited<ReturnType<typeof batchUpdateTransactions>>>;
 
   'transaction-add': (transaction) => Promise<EmptyObject>;
 

package/dist/app/bundle.api.js

@@ -25745,6 +25745,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 }
             }
+            function regexp(regex, text) {
+                return new RegExp(regex).test(text) ? 1 : 0;
+            }
             function openDatabase(pathOrBuffer) {
                 const db = new (better_sqlite3__WEBPACK_IMPORTED_MODULE_0___default())(pathOrBuffer);
                 // Define Unicode-aware LOWER and UPPER implementation.
@@ -25757,6 +25760,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 db.function('UNICODE_UPPER', {
                     deterministic: true
                 }, (arg) => arg?.toUpperCase());
+                // @ts-expect-error @types/better-sqlite3 does not support setting strict 3rd argument
+                db.function('REGEXP', {
+                    deterministic: true
+                }, regexp);
                 return db;
             }
             function closeDatabase(db) {
@@ -26370,18 +26377,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ rankRules: () => ( /* binding */rankRules)
                 /* harmony export */ 
             });
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isValid/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parseISO/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subDays/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isValid/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parseISO/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addDays/index.js");
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../shared/months */ "./packages/loot-core/src/shared/months.ts");
             /* harmony import */ var _shared_rules__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/rules */ "./packages/loot-core/src/shared/rules.ts");
             /* harmony import */ var _shared_schedules__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../shared/schedules */ "./packages/loot-core/src/shared/schedules.ts");
             /* harmony import */ var _shared_transactions__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../shared/transactions */ "./packages/loot-core/src/shared/transactions.ts");
             /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.ts");
             /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../errors */ "./packages/loot-core/src/server/errors.ts");
-            /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../prefs */ "./packages/loot-core/src/server/prefs.ts");
-            /* harmony import */ var _util_rschedule__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../util/rschedule */ "./packages/loot-core/src/server/util/rschedule.ts");
+            /* harmony import */ var _util_rschedule__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../util/rschedule */ "./packages/loot-core/src/server/util/rschedule.ts");
             // @ts-strict-ignore
             function assert(test, type, msg) {
                 if (!test) {
@@ -26393,7 +26399,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     const rules = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_2__.recurConfigToRSchedule)(desc);
                     return {
                         type: 'recur',
-                        schedule: new _util_rschedule__WEBPACK_IMPORTED_MODULE_7__.Schedule({
+                        schedule: new _util_rschedule__WEBPACK_IMPORTED_MODULE_6__.Schedule({
                             rrules: rules,
                             data: {
                                 skipWeekend: desc.skipWeekend,
@@ -26412,7 +26418,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 else if (str.length === 10) {
                     // YYYY-MM-DD
-                    if (!date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](str))) {
+                    if (!date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](str))) {
                         return null;
                     }
                     return {
@@ -26422,7 +26428,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 else if (str.length === 7) {
                     // YYYY-MM
-                    if (!date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](str + '-01'))) {
+                    if (!date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](str + '-01'))) {
                         return null;
                     }
                     return {
@@ -26432,7 +26438,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 else if (str.length === 4) {
                     // YYYY
-                    if (!date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](str + '-01-01'))) {
+                    if (!date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](str + '-01-01'))) {
                         return null;
                     }
                     return {
@@ -26481,6 +26487,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     ops: [
                         'is',
                         'contains',
+                        'matches',
                         'oneOf',
                         'isNot',
                         'doesNotContain',
@@ -26499,6 +26506,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     ops: [
                         'is',
                         'contains',
+                        'matches',
                         'oneOf',
                         'isNot',
                         'doesNotContain',
@@ -26510,7 +26518,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             assert(Array.isArray(value), 'no-empty-array', `oneOf must have an array value (field: ${fieldName}): ${JSON.stringify(value)}`);
                             return value.filter(Boolean).map((val) => val.toLowerCase());
                         }
-                        if (op === 'contains' || op === 'doesNotContain') {
+                        if (op === 'contains' || op === 'matches' || op === 'doesNotContain') {
                             assert(typeof value === 'string' && value.length > 0, 'no-empty-string', `contains must have non-empty string (field: ${fieldName})`);
                         }
                         return value.toLowerCase();
@@ -26611,7 +26619,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                     const { schedule } = this.value;
                                     if (this.op === 'isapprox') {
                                         const fieldDate = (0, _shared_months__WEBPACK_IMPORTED_MODULE_0__.parseDate)(fieldValue);
-                                        return schedule.occursBetween(date_fns__WEBPACK_IMPORTED_MODULE_10__["default"](fieldDate, 2), date_fns__WEBPACK_IMPORTED_MODULE_11__["default"](fieldDate, 2));
+                                        return schedule.occursBetween(date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](fieldDate, 2), date_fns__WEBPACK_IMPORTED_MODULE_10__["default"](fieldDate, 2));
                                     }
                                     else {
                                         return schedule.occursOn({
@@ -26797,7 +26805,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const childActions = actions.filter((action) => action.options?.splitIndex);
                 const totalSplitCount = actions.reduce((prev, cur) => Math.max(prev, cur.options?.splitIndex ?? 0), 0) + 1;
                 let update = execNonSplitActions(parentActions, transaction);
-                if (!_prefs__WEBPACK_IMPORTED_MODULE_6__.getPrefs()?.['flags.splitsInRules'] || totalSplitCount === 1) {
+                if (totalSplitCount === 1) {
+                    // No splits, no need to do anything else.
                     return update;
                 }
                 if (update.is_child) {
@@ -27008,7 +27017,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 lt: 1,
                 lte: 1,
                 contains: 0,
-                doesNotContain: 0
+                doesNotContain: 0,
+                matches: 0
             };
             function computeScore(rule) {
                 const initialScore = rule.conditions.reduce((score, condition) => {
@@ -27298,7 +27308,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     startDate: since
                 }, {
                     'X-ACTUAL-TOKEN': userToken
-                });
+                }, 60000);
                 if (res.error_code) {
                     throw BankSyncError(res.error_type, res.error_code);
                 }
@@ -28459,6 +28469,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             // Running contains with id will automatically reach into
                             // the `name` of the referenced table and do a string match
                             return apply(type === 'id' ? field + '.name' : field, '$like', '%' + value + '%');
+                        case 'matches':
+                            // Running contains with id will automatically reach into
+                            // the `name` of the referenced table and do a regex match
+                            return apply(type === 'id' ? field + '.name' : field, '$regexp', value);
                         case 'doesNotContain':
                             // Running contains with id will automatically reach into
                             // the `name` of the referenced table and do a string match
@@ -30685,6 +30699,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             ]);
                             return `${left} LIKE ${right}`;
                         }
+                    case '$regexp':
+                        {
+                            const [left, right] = valArray(state, [
+                                lhs,
+                                rhs
+                            ], [
+                                'string',
+                                'string'
+                            ]);
+                            return `REGEXP(${right}, ${left})`;
+                        }
                     case '$notlike':
                         {
                             const [left, right] = valArray(state, [
@@ -31739,6 +31764,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     show_uncategorized: f('integer', {
                         default: 0
                     }),
+                    include_current: f('integer', {
+                        default: 0
+                    }),
                     selected_categories: f('json'),
                     graph_type: f('string', {
                         default: 'BarGraph'
@@ -32276,6 +32304,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
                 /* harmony export */ copyPreviousMonth: () => ( /* binding */copyPreviousMonth),
                 /* harmony export */ copySinglePreviousMonth: () => ( /* binding */copySinglePreviousMonth),
+                /* harmony export */ coverOverbudgeted: () => ( /* binding */coverOverbudgeted),
                 /* harmony export */ coverOverspending: () => ( /* binding */coverOverspending),
                 /* harmony export */ getBudget: () => ( /* binding */getBudget),
                 /* harmony export */ getSheetValue: () => ( /* binding */getSheetValue),
@@ -32480,16 +32509,22 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         const spent1 = await getSheetValue(_shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(prevMonth1), 'sum-amount-' + cat.id);
                         const spent2 = await getSheetValue(_shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(prevMonth2), 'sum-amount-' + cat.id);
                         const spent3 = await getSheetValue(_shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(prevMonth3), 'sum-amount-' + cat.id);
-                        const avg = Math.round((spent1 + spent2 + spent3) / 3);
+                        let avg = Math.round((spent1 + spent2 + spent3) / 3);
+                        if (cat.is_income === 0) {
+                            avg *= -1;
+                        }
                         setBudget({
                             category: cat.id,
                             month,
-                            amount: -avg
+                            amount: avg
                         });
                     }
                 });
             }
             async function setNMonthAvg({ month, N, category }) {
+                const categoryFromDb = await _db__WEBPACK_IMPORTED_MODULE_2__.first('SELECT is_income FROM v_categories WHERE id = ?', [
+                    category
+                ]);
                 let prevMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__.prevMonth(month);
                 let sumAmount = 0;
                 for (let l = 0; l < N; l++) {
@@ -32497,11 +32532,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     prevMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__.prevMonth(prevMonth);
                 }
                 await (0, _sync__WEBPACK_IMPORTED_MODULE_5__.batchMessages)(async () => {
-                    const avg = Math.round(sumAmount / N);
+                    let avg = Math.round(sumAmount / N);
+                    if (categoryFromDb.is_income === 0) {
+                        avg *= -1;
+                    }
                     setBudget({
                         category,
                         month,
-                        amount: -avg
+                        amount: avg
                     });
                 });
             }
@@ -32556,6 +32594,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     amount: budgeted + amount
                 });
             }
+            async function coverOverbudgeted({ month, category }) {
+                const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(month);
+                const toBudget = await getSheetValue(sheetName, 'to-budget');
+                const categoryBudget = await getSheetValue(sheetName, 'budget-' + category);
+                await setBudget({
+                    category,
+                    month,
+                    amount: categoryBudget + toBudget
+                });
+            }
             async function transferCategory({ month, amount, from, to }) {
                 const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(month);
                 const fromBudgeted = await getSheetValue(sheetName, 'budget-' + from);
@@ -32619,6 +32667,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             app.method('budget/reset-hold', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.resetHold)));
             app.method('budget/cover-overspending', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.coverOverspending)));
             app.method('budget/transfer-available', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.transferAvailable)));
+            app.method('budget/cover-overbudgeted', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.coverOverbudgeted)));
             app.method('budget/transfer-category', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.transferCategory)));
             app.method('budget/set-carryover', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.setCategoryCarryover)));
             /***/ 
@@ -35207,7 +35256,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ moveCategory: () => ( /* binding */moveCategory),
                 /* harmony export */ moveCategoryGroup: () => ( /* binding */moveCategoryGroup),
                 /* harmony export */ openDatabase: () => ( /* binding */openDatabase),
-                /* harmony export */ reopenDatabase: () => ( /* binding */reopenDatabase),
                 /* harmony export */ run: () => ( /* binding */run),
                 /* harmony export */ runQuery: () => ( /* binding */runQuery),
                 /* harmony export */ select: () => ( /* binding */select),
@@ -35239,8 +35287,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../sync */ "./packages/loot-core/src/server/sync/index.ts");
             /* harmony import */ var _sort__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./sort */ "./packages/loot-core/src/server/db/sort.ts");
             // @ts-strict-ignore
-            let dbPath;
-            let db;
+            let dbPath = null;
+            let db = null;
             // Util
             function getDatabasePath() {
                 return dbPath;
@@ -35253,10 +35301,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 setDatabase(await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_3__.openDatabase(dbPath));
                 // await execQuery('PRAGMA journal_mode = WAL');
             }
-            async function reopenDatabase() {
-                await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_3__.closeDatabase(db);
-                setDatabase(await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_3__.openDatabase(dbPath));
-            }
             async function closeDatabase() {
                 if (db) {
                     await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_3__.closeDatabase(db);
@@ -35659,7 +35703,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
     SELECT p.*, COALESCE(a.name, p.name) AS name FROM payees p
     LEFT JOIN accounts a ON (p.transfer_acct = a.id AND a.tombstone = 0)
     WHERE p.tombstone = 0 AND (p.transfer_acct IS NULL OR a.id IS NOT NULL)
-    ORDER BY p.transfer_acct IS NULL DESC, p.name COLLATE NOCASE
+    ORDER BY p.transfer_acct IS NULL DESC, p.name COLLATE NOCASE, a.offbudget, a.sort_order
   `);
             }
             function syncGetOrphanedPayees() {
@@ -36867,6 +36911,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     else if (cat.category_group_id === findIdByName(data.category_groups, 'Credit Card Payments')) {
                         return 'creditCard';
                     }
+                    else if (cat.category_group_id === findIdByName(data.category_groups, 'Income')) {
+                        return 'income';
+                    }
                 }
                 // Can't be done in parallel to have
                 // correct sort order.
@@ -36874,13 +36921,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (!group.deleted) {
                         let groupId;
                         // Ignores internal category and credit cards
-                        if (!equalsIgnoreCase(group.name, 'Internal Master Category') && !equalsIgnoreCase(group.name, 'Credit Card Payments')) {
+                        if (!equalsIgnoreCase(group.name, 'Internal Master Category') && !equalsIgnoreCase(group.name, 'Credit Card Payments') && !equalsIgnoreCase(group.name, 'Income')) {
                             groupId = await _actual_app_api_methods__WEBPACK_IMPORTED_MODULE_0__.createCategoryGroup({
                                 name: group.name,
                                 is_income: false
                             });
                             entityIdMap.set(group.id, groupId);
                         }
+                        if (equalsIgnoreCase(group.name, 'Income')) {
+                            groupId = incomeCatId;
+                            entityIdMap.set(group.id, groupId);
+                        }
                         const cats = data.categories.filter((cat) => cat.category_group_id === group.id);
                         for (const cat of cats.reverse()) {
                             if (!cat.deleted) {
@@ -37304,8 +37355,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         deleted,
                         learnCategories
                     });
-                    // Return all data updates to the frontend
-                    return result.updated;
+                    return result;
                 });
             });
             handlers['transaction-add'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function (transaction) {
@@ -37781,7 +37831,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const institution = {
                     name: externalAccount.institution ?? 'Unknown'
                 };
-                const bank = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.findOrCreateBank(institution, externalAccount.orgDomain);
+                const bank = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.findOrCreateBank(institution, externalAccount.orgDomain ?? externalAccount.orgId);
                 if (upgradingId) {
                     const accRow = await _db__WEBPACK_IMPORTED_MODULE_27__.first('SELECT * FROM accounts WHERE id = ?', [
                         upgradingId
@@ -38063,9 +38113,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         error: 'unauthorized'
                     };
                 }
-                return (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().SIMPLEFIN_SERVER + '/accounts', {}, {
-                    'X-ACTUAL-TOKEN': userToken
-                });
+                try {
+                    return await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().SIMPLEFIN_SERVER + '/accounts', {}, {
+                        'X-ACTUAL-TOKEN': userToken
+                    }, 60000);
+                }
+                catch (error) {
+                    return {
+                        error_code: 'TIMED_OUT'
+                    };
+                }
             };
             handlers['gocardless-get-banks'] = async function (country) {
                 const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('user-token');
@@ -38149,7 +38206,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             else if (err instanceof _errors__WEBPACK_IMPORTED_MODULE_30__.PostError && err.reason !== 'internal') {
                                 errors.push({
                                     accountId: acct.id,
-                                    message: `Account “${acct.name}” is not linked properly. Please link it again`
+                                    message: err.reason ? err.reason : `Account “${acct.name}” is not linked properly. Please link it again.`
                                 });
                             }
                             else {
@@ -39632,18 +39689,23 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     throw new _errors__WEBPACK_IMPORTED_MODULE_1__.PostError(text);
                 }
             }
-            async function post(url, data, headers = {}) {
+            async function post(url, data, headers = {}, timeout = null) {
                 let text;
                 let res;
                 try {
+                    const controller = new AbortController();
+                    const timeoutId = setTimeout(() => controller.abort(), timeout);
+                    const signal = timeout ? controller.signal : null;
                     res = await (0, _platform_server_fetch__WEBPACK_IMPORTED_MODULE_0__.fetch)(url, {
                         method: 'POST',
                         body: JSON.stringify(data),
+                        signal,
                         headers: {
                             ...headers,
                             'Content-Type': 'application/json'
                         }
                     });
+                    clearTimeout(timeoutId);
                     text = await res.text();
                 }
                 catch (err) {
@@ -39842,6 +39904,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         showOffBudget: row.show_offbudget === 1,
                         showHiddenCategories: row.show_hidden === 1,
                         showUncategorized: row.show_uncategorized === 1,
+                        includeCurrentInterval: row.include_current === 1,
                         selectedCategories: row.selected_categories,
                         graphType: row.graph_type,
                         conditions: row.conditions,
@@ -39865,6 +39928,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         show_offbudget: report.showOffBudget ? 1 : 0,
                         show_hidden: report.showHiddenCategories ? 1 : 0,
                         show_uncategorized: report.showUncategorized ? 1 : 0,
+                        include_current: report.includeCurrentInterval ? 1 : 0,
                         selected_categories: report.selectedCategories,
                         graph_type: report.graphType,
                         conditions: report.conditions,
@@ -41202,6 +41266,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ Graph: () => ( /* binding */Graph)
                 /* harmony export */ 
             });
+            /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../prefs */ "./packages/loot-core/src/server/prefs.ts");
             // @ts-strict-ignore
             function Graph() {
                 const graph = {
@@ -41272,27 +41337,84 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     return graph;
                 }
-                function topologicalSortUntil(name, visited, sorted) {
+                function topologicalSort(sourceNodes) {
+                    const visited = new Set();
+                    const sorted = [];
+                    const prefs = (0, _prefs__WEBPACK_IMPORTED_MODULE_0__.getPrefs)();
+                    const iterableTopologicalSort = prefs != null ? prefs['flags.iterableTopologicalSort'] : false;
+                    sourceNodes.forEach((name) => {
+                        if (!visited.has(name)) {
+                            if (iterableTopologicalSort) {
+                                topologicalSortIterable(name, visited, sorted);
+                            }
+                            else {
+                                topologicalSortUntil(name, visited, sorted, 0);
+                            }
+                        }
+                    });
+                    return sorted;
+                }
+                function topologicalSortUntil(name, visited, sorted, level) {
                     visited.add(name);
+                    if (level > 2500) {
+                        console.error('Limit of recursions reached while sorting budget: 2500');
+                        return;
+                    }
                     const iter = adjacent(name).values();
                     let cur = iter.next();
                     while (!cur.done) {
                         if (!visited.has(cur.value)) {
-                            topologicalSortUntil(cur.value, visited, sorted);
+                            topologicalSortUntil(cur.value, visited, sorted, level + 1);
                         }
                         cur = iter.next();
                     }
                     sorted.unshift(name);
                 }
-                function topologicalSort(sourceNodes) {
-                    const visited = new Set();
-                    const sorted = [];
-                    sourceNodes.forEach((name) => {
-                        if (!visited.has(name)) {
-                            topologicalSortUntil(name, visited, sorted);
+                function topologicalSortIterable(name, visited, sorted) {
+                    const stackTrace = [];
+                    stackTrace.push({
+                        count: -1,
+                        value: name,
+                        parent: '',
+                        level: 0
+                    });
+                    while (stackTrace.length > 0) {
+                        const current = stackTrace.slice(-1)[0];
+                        const adjacents = adjacent(current.value);
+                        if (current.count === -1) {
+                            current.count = adjacents.size;
+                        }
+                        if (current.count > 0) {
+                            const iter = adjacents.values();
+                            let cur = iter.next();
+                            while (!cur.done) {
+                                if (!visited.has(cur.value)) {
+                                    stackTrace.push({
+                                        count: -1,
+                                        parent: current.value,
+                                        value: cur.value,
+                                        level: current.level + 1
+                                    });
+                                }
+                                else {
+                                    current.count--;
+                                }
+                                cur = iter.next();
+                            }
                         }
-                    });
-                    return sorted;
+                        else {
+                            if (!visited.has(current.value)) {
+                                visited.add(current.value);
+                                sorted.unshift(current.value);
+                            }
+                            const removed = stackTrace.pop();
+                            for (let i = 0; i < stackTrace.length; i++) {
+                                if (stackTrace[i].value === removed.parent) {
+                                    stackTrace[i].count--;
+                                }
+                            }
+                        }
+                    }
                 }
                 function generateDOT() {
                     const edgeStrings = [];
@@ -41302,9 +41424,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                     });
                     return `
-      digraph G {
-       ${edgeStrings.join('\n').replace(/!/g, '_')}
-      }
+    digraph G {
+      ${edgeStrings.join('\n').replace(/!/g, '_')}
+    }
     `;
                 }
                 return graph;
@@ -43735,7 +43857,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function _yearRange(start, end, inclusive = false) {
                 const years = [];
                 let year = yearFromDate(start);
-                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(year), _parse(end))) {
+                const endYear = yearFromDate(end);
+                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(year), _parse(endYear))) {
                     years.push(year);
                     year = addYears(year, 1);
                 }
@@ -43766,7 +43889,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function _range(start, end, inclusive = false) {
                 const months = [];
                 let month = monthFromDate(start);
-                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(month), _parse(end))) {
+                const endMonth = monthFromDate(end);
+                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(month), _parse(endMonth))) {
                     months.push(month);
                     month = addMonths(month, 1);
                 }
@@ -44073,6 +44197,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     ops: [
                         'is',
                         'contains',
+                        'matches',
                         'oneOf',
                         'isNot',
                         'doesNotContain',
@@ -44088,6 +44213,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     ops: [
                         'is',
                         'contains',
+                        'matches',
                         'oneOf',
                         'isNot',
                         'doesNotContain',
@@ -44130,7 +44256,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }));
             const ALLOCATION_METHODS = {
                 'fixed-amount': 'a fixed amount',
-                'fixed-percent': 'a fixed percent',
+                'fixed-percent': 'a fixed percent of the remainder',
                 remainder: 'an equal portion of the remainder'
             };
             function mapField(field, opts) {
@@ -44170,6 +44296,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         return 'is between';
                     case 'contains':
                         return 'contains';
+                    case 'matches':
+                        return 'matches';
                     case 'doesNotContain':
                         return 'does not contain';
                     case 'gt':
@@ -44428,7 +44556,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         $and: {
                             schedule: schedule.id,
                             date: {
-                                $gte: dateCond && dateCond.op === 'is' ? schedule.next_date : _months__WEBPACK_IMPORTED_MODULE_0__.subDays(schedule.next_date, 7)
+                                $gte: dateCond && dateCond.op === 'is' ? schedule.next_date : _months__WEBPACK_IMPORTED_MODULE_0__.subDays(schedule.next_date, 2)
                             }
                         }
                     };
@@ -44672,6 +44800,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ groupTransaction: () => ( /* binding */groupTransaction),
                 /* harmony export */ isPreviewId: () => ( /* binding */isPreviewId),
                 /* harmony export */ isTemporaryId: () => ( /* binding */isTemporaryId),
+                /* harmony export */ makeAsNonChildTransactions: () => ( /* binding */makeAsNonChildTransactions),
                 /* harmony export */ makeChild: () => ( /* binding */makeChild),
                 /* harmony export */ realizeTempTransactions: () => ( /* binding */realizeTempTransactions),
                 /* harmony export */ recalculateSplit: () => ( /* binding */recalculateSplit),
@@ -44701,7 +44830,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     difference
                 };
             }
-            function makeChild(parent, data) {
+            function makeChild(parent, data = {}) {
                 const prefix = parent.id === 'temp' ? 'temp' : '';
                 return {
                     amount: 0,
@@ -44719,6 +44848,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     error: null
                 };
             }
+            function makeNonChild(parent, data) {
+                return {
+                    amount: 0,
+                    ...data,
+                    cleared: parent.cleared != null ? parent.cleared : null,
+                    reconciled: parent.reconciled != null ? parent.reconciled : null,
+                    sort_order: parent.sort_order || null,
+                    starting_balance_flag: null,
+                    is_child: false,
+                    parent_id: null
+                };
+            }
             function recalculateSplit(trans) {
                 // Calculate the new total of split transactions and make sure
                 // that it equals the parent amount
@@ -44920,21 +45061,22 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 });
             }
-            function splitTransaction(transactions, id) {
+            function splitTransaction(transactions, id, createSubtransactions) {
                 return replaceTransactions(transactions, id, (trans) => {
                     if (trans.is_parent || trans.is_child) {
                         return trans;
                     }
+                    const subtransactions = createSubtransactions?.(trans) || [
+                        makeChild(trans)
+                    ];
                     return {
                         ...trans,
                         is_parent: true,
                         error: num(trans.amount) === 0 ? null : SplitTransactionError(0, trans),
-                        subtransactions: [
-                            makeChild(trans, {
-                                amount: 0,
-                                sort_order: -1
-                            })
-                        ]
+                        subtransactions: subtransactions.map((t) => ({
+                            ...t,
+                            sort_order: t.sort_order || -1
+                        }))
                     };
                 });
             }
@@ -44953,6 +45095,35 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }))
                 ];
             }
+            function makeAsNonChildTransactions(childTransactionsToUpdate, transactions) {
+                const [parentTransaction, ...childTransactions] = transactions;
+                const newNonChildTransactions = childTransactionsToUpdate.map((t) => makeNonChild(parentTransaction, t));
+                const remainingChildTransactions = childTransactions.filter((t) => !newNonChildTransactions.some((updatedTrans) => updatedTrans.id === t.id));
+                const nonChildTransactionsToUpdate = remainingChildTransactions.length === 1 ? [
+                    ...newNonChildTransactions,
+                    makeNonChild(parentTransaction, remainingChildTransactions[0])
+                ] : newNonChildTransactions;
+                const deleteParentTransaction = remainingChildTransactions.length <= 1;
+                const updatedParentTransaction = {
+                    ...parentTransaction,
+                    ...!deleteParentTransaction ? {
+                        amount: remainingChildTransactions.map((t) => t.amount).reduce((total, amount) => total + amount, 0)
+                    } : {}
+                };
+                return {
+                    updated: [
+                        ...!deleteParentTransaction ? [
+                            updatedParentTransaction
+                        ] : [],
+                        ...nonChildTransactionsToUpdate
+                    ],
+                    deleted: [
+                        ...deleteParentTransaction ? [
+                            updatedParentTransaction
+                        ] : []
+                    ]
+                };
+            }
             /***/ 
         }),
         /***/ "./packages/loot-core/src/shared/util.ts": 
@@ -45331,9 +45502,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (amount.startsWith('(') && amount.endsWith(')')) {
                     amount = amount.replace('(', '-').replace(')', '');
                 }
-                //look for a decimal marker, then look for either 5 or 1-2 decimal places.
+                // Look for a decimal marker, then look for either 1-2 or 5-9 decimal places.
                 // This avoids matching against 3 places which may not actually be decimal
-                const m = amount.match(/[.,]([^.,]{5}|[^.,]{1,2})$/);
+                const m = amount.match(/[.,]([^.,]{5,9}|[^.,]{1,2})$/);
                 if (!m || m.index === undefined || m.index === 0) {
                     return safeNumber(parseFloat(extractNumbers(amount)));
                 }

package/dist/migrations/1716359441000_include_current.sql

@@ -0,0 +1,5 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE custom_reports ADD COLUMN include_current INTEGER DEFAULT 0;
+
+COMMIT;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@actual-app/api",
-    "version": "6.8.0",
+    "version": "6.8.2",
     "license": "MIT",
     "description": "An API for Actual",
     "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/api",
-  "version": "6.8.0",
+  "version": "6.8.2",
   "license": "MIT",
   "description": "An API for Actual",
   "engines": {
@@ -22,7 +22,7 @@
     "clean": "rm -rf dist @types"
   },
   "dependencies": {
-    "@actual-app/crdt": "workspace:^",
+    "@actual-app/crdt": "^2.1.0",
     "better-sqlite3": "^9.6.0",
     "compare-versions": "^6.1.0",
     "node-fetch": "^3.3.2",
@@ -37,4 +37,4 @@
     "tsc-alias": "^1.8.8",
     "typescript": "^5.0.2"
   }
-}
+}