@actual-app/api 24.12.0 → 25.1.0

package/dist/app/bundle.api.js

@@ -34184,7 +34184,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         'isNot',
                         'doesNotContain',
                         'notOneOf',
-                        'and'
+                        'and',
+                        'onBudget',
+                        'offBudget'
                     ],
                     nullable: true,
                     parse(op, value, fieldName) {
@@ -34429,6 +34431,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 console.log('invalid regexp in matches condition', e);
                                 return false;
                             }
+                        case 'onBudget':
+                            if (!object._account) {
+                                return false;
+                            }
+                            return object._account.offbudget === 0;
+                        case 'offBudget':
+                            if (!object._account) {
+                                return false;
+                            }
+                            return object._account.offbudget === 1;
                         default:
                     }
                     return false;
@@ -34752,7 +34764,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 contains: 0,
                 doesNotContain: 0,
                 matches: 0,
-                hasTags: 0
+                hasTags: 0,
+                onBudget: 0,
+                offBudget: 0
             };
             function computeScore(rule) {
                 const initialScore = rule.conditions.reduce((score, condition) => {
@@ -34956,11 +34970,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _transaction_rules__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./transaction-rules */ "./packages/loot-core/src/server/accounts/transaction-rules.ts");
             /* harmony import */ var _transactions__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./transactions */ "./packages/loot-core/src/server/accounts/transactions.ts");
             // @ts-strict-ignore
-            function BankSyncError(type, code) {
+            function BankSyncError(type, code, details) {
                 return {
                     type: 'BankSyncError',
                     category: type,
-                    code
+                    code,
+                    details
                 };
             }
             function makeSplitTransaction(trans, subtransactions) {
@@ -35046,7 +35061,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     'X-ACTUAL-TOKEN': userToken
                 });
                 if (res.error_code) {
-                    throw BankSyncError(res.error_type, res.error_code);
+                    const errorDetails = {
+                        rateLimitHeaders: res.rateLimitHeaders
+                    };
+                    throw BankSyncError(res.error_type, res.error_code, errorDetails);
                 }
                 if (includeBalance) {
                     const { transactions: { all }, balances, startingBalance } = res;
@@ -35076,6 +35094,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }, {
                     'X-ACTUAL-TOKEN': userToken
                 }, 60000);
+                if (Object.keys(res).length === 0) {
+                    throw BankSyncError('NO_DATA', 'NO_DATA');
+                }
                 if (res.error_code) {
                     throw BankSyncError(res.error_type, res.error_code);
                 }
@@ -35350,10 +35371,15 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const transactionNormalization = isBankSyncAccount ? normalizeBankSyncTransactions : normalizeTransactions;
                 const { normalized, payeesToCreate } = await transactionNormalization(transactions, acctId);
                 // The first pass runs the rules, and preps data for fuzzy matching
+                const accounts = await _db__WEBPACK_IMPORTED_MODULE_6__.getAccounts();
+                const accountsMap = new Map(accounts.map((account) => [
+                    account.id,
+                    account
+                ]));
                 const transactionsStep1 = [];
                 for (const { payee_name, trans: originalTrans, subtransactions } of normalized) {
                     // Run the rules
-                    const trans = await (0, _transaction_rules__WEBPACK_IMPORTED_MODULE_13__.runRules)(originalTrans);
+                    const trans = await (0, _transaction_rules__WEBPACK_IMPORTED_MODULE_13__.runRules)(originalTrans, accountsMap);
                     let match = null;
                     let fuzzyDataset = null;
                     // First, match with an existing transaction's imported_id. This
@@ -35471,9 +35497,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const { normalized, payeesToCreate } = await normalizeTransactions(transactions, acctId, {
                     rawPayeeName: true
                 });
+                const accounts = await _db__WEBPACK_IMPORTED_MODULE_6__.getAccounts();
+                const accountsMap = new Map(accounts.map((account) => [
+                    account.id,
+                    account
+                ]));
                 for (const { trans: originalTrans, subtransactions } of normalized) {
                     // Run the rules
-                    const trans = await (0, _transaction_rules__WEBPACK_IMPORTED_MODULE_13__.runRules)(originalTrans);
+                    const trans = await (0, _transaction_rules__WEBPACK_IMPORTED_MODULE_13__.runRules)(originalTrans, accountsMap);
                     const finalTransaction = {
                         id: (0, uuid__WEBPACK_IMPORTED_MODULE_16__["default"])(),
                         ...trans,
@@ -36063,10 +36094,20 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
             }
             // Runner
-            async function runRules(trans) {
+            async function runRules(trans, accounts = null) {
+                let accountsMap = null;
+                if (accounts === null) {
+                    accountsMap = new Map((await _db__WEBPACK_IMPORTED_MODULE_5__.getAccounts()).map((account) => [
+                        account.id,
+                        account
+                    ]));
+                }
+                else {
+                    accountsMap = accounts;
+                }
                 let finalTrans = await prepareTransactionForRules({
                     ...trans
-                });
+                }, accountsMap);
                 const rules = (0, _rules__WEBPACK_IMPORTED_MODULE_10__.rankRules)((0, _shared_util__WEBPACK_IMPORTED_MODULE_3__.fastSetMerge)(firstcharIndexer.getApplicableRules(trans), payeeIndexer.getApplicableRules(trans)));
                 for (let i = 0; i < rules.length; i++) {
                     finalTrans = rules[i].apply(finalTrans);
@@ -36074,6 +36115,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return await finalizeTransactionForRules(finalTrans);
             }
             function conditionSpecialCases(cond) {
+                if (!cond) {
+                    return cond;
+                }
                 //special cases that require multiple conditions
                 if (cond.op === 'is' && cond.field === 'category' && cond.value === null) {
                     return new _rules__WEBPACK_IMPORTED_MODULE_10__.Condition('and', cond.field, [
@@ -36408,6 +36452,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             return {
                                 $and: getValue(value).map((subExpr) => mapConditionToActualQL(subExpr))
                             };
+                        case 'onBudget':
+                            return {
+                                'account.offbudget': false
+                            };
+                        case 'offBudget':
+                            return {
+                                'account.offbudget': true
+                            };
                         default:
                             throw new Error('Unhandled operator: ' + op);
                     }
@@ -36444,7 +36496,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     // An error happened while parsing
                     return null;
                 }
-                const transactionsForRules = await Promise.all(transactions.map(prepareTransactionForRules));
+                const accounts = await _db__WEBPACK_IMPORTED_MODULE_5__.getAccounts();
+                const transactionsForRules = await Promise.all(transactions.map((transactions) => prepareTransactionForRules(transactions, new Map(accounts.map((account) => [
+                    account.id,
+                    account
+                ])))));
                 const updated = transactionsForRules.flatMap((trans) => {
                     return (0, _shared_transactions__WEBPACK_IMPORTED_MODULE_2__.ungroupTransaction)((0, _rules__WEBPACK_IMPORTED_MODULE_10__.execActions)(parsedActions, trans));
                 });
@@ -36652,7 +36708,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 });
             }
-            async function prepareTransactionForRules(trans) {
+            async function prepareTransactionForRules(trans, accounts = null) {
                 const r = {
                     ...trans
                 };
@@ -36662,6 +36718,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         r.payee_name = payee.name;
                     }
                 }
+                if (trans.account) {
+                    if (accounts !== null && accounts.has(trans.account)) {
+                        r._account = accounts.get(trans.account);
+                    }
+                    else {
+                        r._account = await (0, _db__WEBPACK_IMPORTED_MODULE_5__.getAccount)(trans.account);
+                    }
+                }
                 return r;
             }
             async function finalizeTransactionForRules(trans) {
@@ -36869,7 +36933,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const { offbudget: toOffBudget } = await _db__WEBPACK_IMPORTED_MODULE_0__.first('SELECT offbudget FROM accounts WHERE id = ?', [
                     transferAcct
                 ]);
-                // If the transfer is between two on-budget or two off-budget accounts,
+                // If the transfer is between two on budget or two off budget accounts,
                 // we should clear the category, because the category is not relevant
                 if (fromOffBudget === toOffBudget) {
                     await _db__WEBPACK_IMPORTED_MODULE_0__.updateTransaction({
@@ -37152,6 +37216,191 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             /***/ 
         }),
+        /***/ "./packages/loot-core/src/server/admin/app.ts": 
+        /*!****************************************************!*\
+          !*** ./packages/loot-core/src/server/admin/app.ts ***!
+          \****************************************************/
+        /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+                /* harmony export */ app: () => ( /* binding */app)
+                /* harmony export */ 
+            });
+            /* harmony import */ var _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../platform/server/asyncStorage */ "./packages/loot-core/src/platform/server/asyncStorage/index.electron.ts");
+            /* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../app */ "./packages/loot-core/src/server/app.ts");
+            /* harmony import */ var _post__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../post */ "./packages/loot-core/src/server/post.ts");
+            /* harmony import */ var _server_config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../server-config */ "./packages/loot-core/src/server/server-config.ts");
+            // @ts-strict-ignore
+            // Expose functions to the client
+            const app = (0, _app__WEBPACK_IMPORTED_MODULE_1__.createApp)();
+            app.method('user-delete-all', async function (ids) {
+                const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.getItem('user-token');
+                if (userToken) {
+                    try {
+                        const res = await (0, _post__WEBPACK_IMPORTED_MODULE_2__.del)((0, _server_config__WEBPACK_IMPORTED_MODULE_3__.getServer)().BASE_SERVER + '/admin/users', {
+                            ids
+                        }, {
+                            'X-ACTUAL-TOKEN': userToken
+                        });
+                        if (res) {
+                            return res;
+                        }
+                    }
+                    catch (err) {
+                        return {
+                            error: err.reason
+                        };
+                    }
+                }
+                return {
+                    someDeletionsFailed: true
+                };
+            });
+            app.method('users-get', async function () {
+                const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.getItem('user-token');
+                if (userToken) {
+                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_2__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_3__.getServer)().BASE_SERVER + '/admin/users/', {
+                        headers: {
+                            'X-ACTUAL-TOKEN': userToken
+                        }
+                    });
+                    if (res) {
+                        try {
+                            const list = JSON.parse(res);
+                            return list;
+                        }
+                        catch (err) {
+                            return {
+                                error: 'Failed to parse response: ' + err.message
+                            };
+                        }
+                    }
+                }
+                return null;
+            });
+            app.method('user-add', async function (user) {
+                const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.getItem('user-token');
+                if (userToken) {
+                    try {
+                        const res = await (0, _post__WEBPACK_IMPORTED_MODULE_2__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_3__.getServer)().BASE_SERVER + '/admin/users/', user, {
+                            'X-ACTUAL-TOKEN': userToken
+                        });
+                        return res;
+                    }
+                    catch (err) {
+                        return {
+                            error: err.reason
+                        };
+                    }
+                }
+                return null;
+            });
+            app.method('user-update', async function (user) {
+                const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.getItem('user-token');
+                if (userToken) {
+                    try {
+                        const res = await (0, _post__WEBPACK_IMPORTED_MODULE_2__.patch)((0, _server_config__WEBPACK_IMPORTED_MODULE_3__.getServer)().BASE_SERVER + '/admin/users/', user, {
+                            'X-ACTUAL-TOKEN': userToken
+                        });
+                        return res;
+                    }
+                    catch (err) {
+                        return {
+                            error: err.reason
+                        };
+                    }
+                }
+                return null;
+            });
+            app.method('access-add', async function (access) {
+                const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.getItem('user-token');
+                if (userToken) {
+                    try {
+                        await (0, _post__WEBPACK_IMPORTED_MODULE_2__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_3__.getServer)().BASE_SERVER + '/admin/access/', access, {
+                            'X-ACTUAL-TOKEN': userToken
+                        });
+                        return {};
+                    }
+                    catch (err) {
+                        return {
+                            error: err.reason
+                        };
+                    }
+                }
+                return null;
+            });
+            app.method('access-delete-all', async function ({ fileId, ids }) {
+                const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.getItem('user-token');
+                if (userToken) {
+                    try {
+                        const res = await (0, _post__WEBPACK_IMPORTED_MODULE_2__.del)((0, _server_config__WEBPACK_IMPORTED_MODULE_3__.getServer)().BASE_SERVER + `/admin/access?fileId=${fileId}`, {
+                            token: userToken,
+                            ids
+                        });
+                        if (res) {
+                            return res;
+                        }
+                    }
+                    catch (err) {
+                        return {
+                            error: err.reason
+                        };
+                    }
+                }
+                return {
+                    someDeletionsFailed: true
+                };
+            });
+            app.method('access-get-available-users', async function (fileId) {
+                const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.getItem('user-token');
+                if (userToken) {
+                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_2__.get)(`${(0, _server_config__WEBPACK_IMPORTED_MODULE_3__.getServer)().BASE_SERVER + '/admin/access/users'}?fileId=${fileId}`, {
+                        headers: {
+                            'X-ACTUAL-TOKEN': userToken
+                        }
+                    });
+                    if (res) {
+                        try {
+                            return JSON.parse(res);
+                        }
+                        catch (err) {
+                            return {
+                                error: 'Failed to parse response: ' + err.message
+                            };
+                        }
+                    }
+                }
+                return [];
+            });
+            app.method('transfer-ownership', async function ({ fileId, newUserId }) {
+                const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.getItem('user-token');
+                if (userToken) {
+                    try {
+                        await (0, _post__WEBPACK_IMPORTED_MODULE_2__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_3__.getServer)().BASE_SERVER + '/admin/access/transfer-ownership/', {
+                            fileId,
+                            newUserId
+                        }, {
+                            'X-ACTUAL-TOKEN': userToken
+                        });
+                    }
+                    catch (err) {
+                        return {
+                            error: err.reason
+                        };
+                    }
+                }
+                return {};
+            });
+            app.method('owner-created', async function () {
+                const res = await (0, _post__WEBPACK_IMPORTED_MODULE_2__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_3__.getServer)().BASE_SERVER + '/admin/owner-created/');
+                if (res) {
+                    return JSON.parse(res);
+                }
+                return null;
+            });
+            /***/ 
+        }),
         /***/ "./packages/loot-core/src/server/api-models.ts": 
         /*!*****************************************************!*\
           !*** ./packages/loot-core/src/server/api-models.ts ***!
@@ -37257,7 +37506,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         groupId: file.groupId,
                         name: file.name,
                         encryptKeyId: file.encryptKeyId,
-                        hasKey: file.hasKey
+                        hasKey: file.hasKey,
+                        owner: file.owner,
+                        usersWithAccess: file.usersWithAccess
                     };
                 },
                 fromExternal(file) {
@@ -41239,11 +41490,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                */ //-----------------------------------------------------------------------------
                 // Class interface
                 // set up the class and check all templates
-                static async init(templates, categoryID, month) {
+                static async init(templates, category, month) {
                     // get all the needed setup values
                     const lastMonthSheet = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(_shared_months__WEBPACK_IMPORTED_MODULE_0__.subMonths(month, 1));
-                    const lastMonthBalance = await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(lastMonthSheet, `leftover-${categoryID}`);
-                    const carryover = await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetBoolean)(lastMonthSheet, `carryover-${categoryID}`);
+                    const lastMonthBalance = await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(lastMonthSheet, `leftover-${category.id}`);
+                    const carryover = await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetBoolean)(lastMonthSheet, `carryover-${category.id}`);
                     let fromLastMonth;
                     if (lastMonthBalance < 0 && !carryover) {
                         fromLastMonth = 0;
@@ -41255,7 +41506,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     await CategoryTemplate.checkByAndScheduleAndSpend(templates, month);
                     await CategoryTemplate.checkPercentage(templates);
                     // call the private constructor
-                    return new CategoryTemplate(templates, categoryID, month, fromLastMonth);
+                    return new CategoryTemplate(templates, category, month, fromLastMonth);
                 }
                 getPriorities() {
                     return this.priorities;
@@ -41328,8 +41579,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 }
                             case 'schedule':
                                 {
-                                    const budgeted = await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(_shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(this.month), `leftover-${this.categoryID}`);
-                                    const ret = await (0, _goalsSchedule__WEBPACK_IMPORTED_MODULE_4__.goalsSchedule)(scheduleFlag, t, this.month, budgeted, remainder, this.fromLastMonth, toBudget, [], this.categoryID);
+                                    const budgeted = await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(_shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(this.month), `leftover-${this.category.id}`);
+                                    const ret = await (0, _goalsSchedule__WEBPACK_IMPORTED_MODULE_4__.goalsSchedule)(scheduleFlag, t, this.month, budgeted, remainder, this.fromLastMonth, toBudget, [], this.category);
                                     toBudget = ret.to_budget;
                                     remainder = ret.remainder;
                                     scheduleFlag = ret.scheduleFlag;
@@ -41389,7 +41640,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         longGoal: this.isLongGoal
                     };
                 }
-                constructor(templates, categoryID, month, fromLastMonth) {
+                constructor(templates, category, month, fromLastMonth) {
                     this.templates = [];
                     this.remainder = [];
                     this.goals = [];
@@ -41405,7 +41656,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     this.limitAmount = 0;
                     this.limitCheck = false;
                     this.limitHold = false;
-                    this.categoryID = categoryID;
+                    this.category = category;
                     this.month = month;
                     this.fromLastMonth = fromLastMonth;
                     // sort the template lines into regular template, goals, and remainder templates
@@ -41568,7 +41819,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 async runCopy(template) {
                     const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(_shared_months__WEBPACK_IMPORTED_MODULE_0__.subMonths(this.month, template.lookBack));
-                    return await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(sheetName, `budget-${this.categoryID}`);
+                    return await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(sheetName, `budget-${this.category.id}`);
                 }
                 runWeek(template) {
                     let toBudget = 0;
@@ -41585,21 +41836,31 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return toBudget;
                 }
                 async runSpend(template) {
-                    const fromMonth = `${template.from}`;
-                    const toMonth = `${template.month}`;
+                    let fromMonth = `${template.from}`;
+                    let toMonth = `${template.month}`;
                     let alreadyBudgeted = this.fromLastMonth;
                     let firstMonth = true;
+                    //update months if needed
+                    const repeat = template.annual ? (template.repeat || 1) * 12 : template.repeat;
+                    let m = _shared_months__WEBPACK_IMPORTED_MODULE_0__.differenceInCalendarMonths(toMonth, this.month);
+                    if (repeat && m < 0) {
+                        while (m < 0) {
+                            toMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__.addMonths(toMonth, repeat);
+                            fromMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__.addMonths(fromMonth, repeat);
+                            m = _shared_months__WEBPACK_IMPORTED_MODULE_0__.differenceInCalendarMonths(toMonth, this.month);
+                        }
+                    }
                     for (let m = fromMonth; _shared_months__WEBPACK_IMPORTED_MODULE_0__.differenceInCalendarMonths(this.month, m) > 0; m = _shared_months__WEBPACK_IMPORTED_MODULE_0__.addMonths(m, 1)) {
                         const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(m);
                         if (firstMonth) {
                             //TODO figure out if I already  found these values and can pass them in
-                            const spent = await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(sheetName, `sum-amount-${this.categoryID}`);
-                            const balance = await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(sheetName, `leftover-${this.categoryID}`);
+                            const spent = await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(sheetName, `sum-amount-${this.category.id}`);
+                            const balance = await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(sheetName, `leftover-${this.category.id}`);
                             alreadyBudgeted = balance - spent;
                             firstMonth = false;
                         }
                         else {
-                            alreadyBudgeted += await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(sheetName, `budget-${this.categoryID}`);
+                            alreadyBudgeted += await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(sheetName, `budget-${this.category.id}`);
                         }
                     }
                     const numMonths = _shared_months__WEBPACK_IMPORTED_MODULE_0__.differenceInCalendarMonths(toMonth, this.month);
@@ -41640,7 +41901,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     let sum = 0;
                     for (let i = 1; i <= template.numMonths; i++) {
                         const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(_shared_months__WEBPACK_IMPORTED_MODULE_0__.subMonths(this.month, i));
-                        sum += await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(sheetName, `sum-amount-${this.categoryID}`);
+                        sum += await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(sheetName, `sum-amount-${this.category.id}`);
                     }
                     return -Math.round(sum / template.numMonths);
                 }
@@ -42305,9 +42566,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             async function goalsSchedule(scheduleFlag, template_lines, current_month, balance, remainder, last_month_balance, to_budget, errors, category) {
                 if (!scheduleFlag) {
                     scheduleFlag = true;
-                    const template = template_lines.filter((t) => t.type === 'schedule');
+                    const scheduleTemplates = template_lines.filter((t) => t.type === 'schedule');
                     //in the case of multiple templates per category, schedules may have wrong priority level
-                    const t = await createScheduleList(template, current_month, category);
+                    const t = await createScheduleList(scheduleTemplates, current_month, category);
                     errors = errors.concat(t.errors);
                     const isPayMonthOf = (c) => c.full || c.target_frequency === 'monthly' && c.target_interval === 1 && c.num_months === 0 || c.target_frequency === 'weekly' && c.target_interval >= 0 && c.num_months === 0 || c.target_frequency === 'daily' || (0, _actions__WEBPACK_IMPORTED_MODULE_4__.isReflectBudget)();
                     const t_payMonthOf = t.t.filter(isPayMonthOf);
@@ -42464,7 +42725,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     const isReflect = (0, _actions__WEBPACK_IMPORTED_MODULE_3__.isReflectBudget)();
                     const categoriesLong = await getCategories();
                     categoriesLong.forEach((c) => {
-                        if (!isReflect && !c.is_income) {
+                        if (isReflect || !c.is_income) {
                             categories.push(c);
                         }
                     });
@@ -42481,7 +42742,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const budgetList = [];
                 const goalList = [];
                 for (let i = 0; i < categories.length; i++) {
-                    const id = categories[i].id;
+                    const category = categories[i];
+                    const { id } = category;
                     const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(month);
                     const templates = categoryTemplates[id];
                     const budgeted = await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(sheetName, `budget-${id}`);
@@ -42492,7 +42754,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         // gather needed priorities
                         // gather remainder weights
                         try {
-                            const obj = await _categoryTemplate__WEBPACK_IMPORTED_MODULE_4__.CategoryTemplate.init(templates, id, month);
+                            const obj = await _categoryTemplate__WEBPACK_IMPORTED_MODULE_4__.CategoryTemplate.init(templates, category, month);
                             availBudget += budgeted;
                             availBudget += obj.getLimitExcess();
                             const p = obj.getPriorities();
@@ -42553,11 +42815,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 catObjects.forEach((o) => {
                     const ret = o.getValues();
                     budgetList.push({
-                        category: o.categoryID,
+                        category: o.category.id,
                         budgeted: ret.budgeted
                     });
                     goalList.push({
-                        category: o.categoryID,
+                        category: o.category.id,
                         goal: ret.goal,
                         longGoal: ret.longGoal ? 1 : null
                     });
@@ -42873,6 +43135,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ checkKey: () => ( /* binding */checkKey),
                 /* harmony export */ download: () => ( /* binding */download),
                 /* harmony export */ exportBuffer: () => ( /* binding */exportBuffer),
+                /* harmony export */ getRemoteFile: () => ( /* binding */getRemoteFile),
                 /* harmony export */ importBuffer: () => ( /* binding */importBuffer),
                 /* harmony export */ listRemoteFiles: () => ( /* binding */listRemoteFiles),
                 /* harmony export */ possiblyUpload: () => ( /* binding */possiblyUpload),
@@ -42899,6 +43162,20 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             const UPLOAD_FREQUENCY_IN_DAYS = 7;
             async function checkHTTPStatus(res) {
                 if (res.status !== 200) {
+                    if (res.status === 403) {
+                        try {
+                            const text = await res.text();
+                            const data = JSON.parse(text)?.data;
+                            if (data?.reason === 'token-expired') {
+                                await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_1__.removeItem('user-token');
+                                throw new _errors__WEBPACK_IMPORTED_MODULE_7__.HTTPError(403, 'token-expired');
+                            }
+                        }
+                        catch (e) {
+                            if (e instanceof _errors__WEBPACK_IMPORTED_MODULE_7__.HTTPError)
+                                throw e;
+                        }
+                    }
                     return res.text().then((str) => {
                         throw new _errors__WEBPACK_IMPORTED_MODULE_7__.HTTPError(res.status, str);
                     });
@@ -43197,6 +43474,33 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     hasKey: _encryption__WEBPACK_IMPORTED_MODULE_6__.hasKey(file.encryptKeyId)
                 }));
             }
+            async function getRemoteFile(fileId) {
+                const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_1__.getItem('user-token');
+                if (!userToken) {
+                    return null;
+                }
+                let res;
+                try {
+                    res = await fetchJSON((0, _server_config__WEBPACK_IMPORTED_MODULE_11__.getServer)().SYNC_SERVER + '/get-user-file-info', {
+                        headers: {
+                            'X-ACTUAL-TOKEN': userToken,
+                            'X-ACTUAL-FILE-ID': fileId
+                        }
+                    });
+                }
+                catch (e) {
+                    console.log('Unexpected error fetching file from server', e);
+                    return null;
+                }
+                if (res.status === 'error') {
+                    console.log('Error fetching file from server', res);
+                    return null;
+                }
+                return {
+                    ...res.data,
+                    hasKey: _encryption__WEBPACK_IMPORTED_MODULE_6__.hasKey(res.data.encryptKeyId)
+                };
+            }
             async function download(fileId) {
                 const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_1__.getItem('user-token');
                 const syncServer = (0, _server_config__WEBPACK_IMPORTED_MODULE_11__.getServer)().SYNC_SERVER;
@@ -43321,7 +43625,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             'spending-card',
                             'custom-report',
                             'markdown-card',
-                            'summary-card'
+                            'summary-card',
+                            'calendar-card'
                         ].includes(widget.type)) {
                             throw new _errors__WEBPACK_IMPORTED_MODULE_8__.ValidationError(`Invalid widget.${idx}.type value ${widget.type}.`);
                         }
@@ -43474,6 +43779,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ first: () => ( /* binding */first),
                 /* harmony export */ firstSync: () => ( /* binding */firstSync),
                 /* harmony export */ fromDateRepr: () => ( /* reexport safe */_models__WEBPACK_IMPORTED_MODULE_7__.fromDateRepr),
+                /* harmony export */ getAccount: () => ( /* binding */getAccount),
                 /* harmony export */ getAccounts: () => ( /* binding */getAccounts),
                 /* harmony export */ getCategories: () => ( /* binding */getCategories),
                 /* harmony export */ getCategoriesGrouped: () => ( /* binding */getCategoriesGrouped),
@@ -43889,6 +44195,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     id
                 ]);
             }
+            async function getAccount(id) {
+                return first(`SELECT * FROM accounts WHERE id = ?`, [
+                    id
+                ]);
+            }
             async function insertPayee(payee) {
                 payee = _models__WEBPACK_IMPORTED_MODULE_7__.payeeModel.validate(payee);
                 let id;
@@ -45575,7 +45886,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _actual_app_api_injected__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @actual-app/api/injected */ "./packages/api/injected.js");
             /* harmony import */ var _actual_app_crdt__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @actual-app/crdt */ "@actual-app/crdt");
             /* harmony import */ var _actual_app_crdt__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/ __webpack_require__.n(_actual_app_crdt__WEBPACK_IMPORTED_MODULE_2__);
-            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
+            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _mocks_budget__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../mocks/budget */ "./packages/loot-core/src/mocks/budget.ts");
             /* harmony import */ var _platform_exceptions__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../platform/exceptions */ "./packages/loot-core/src/platform/exceptions/index.electron.ts");
             /* harmony import */ var _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../platform/server/asyncStorage */ "./packages/loot-core/src/platform/server/asyncStorage/index.electron.ts");
@@ -45594,45 +45905,46 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _accounts_sync__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./accounts/sync */ "./packages/loot-core/src/server/accounts/sync.ts");
             /* harmony import */ var _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./accounts/transaction-rules */ "./packages/loot-core/src/server/accounts/transaction-rules.ts");
             /* harmony import */ var _accounts_transactions__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./accounts/transactions */ "./packages/loot-core/src/server/accounts/transactions.ts");
-            /* harmony import */ var _api__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./api */ "./packages/loot-core/src/server/api.ts");
-            /* harmony import */ var _aql__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./aql */ "./packages/loot-core/src/server/aql/index.ts");
-            /* harmony import */ var _backups__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ./backups */ "./packages/loot-core/src/server/backups.ts");
-            /* harmony import */ var _budget_app__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ./budget/app */ "./packages/loot-core/src/server/budget/app.ts");
-            /* harmony import */ var _budget_base__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./budget/base */ "./packages/loot-core/src/server/budget/base.ts");
-            /* harmony import */ var _cloud_storage__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ./cloud-storage */ "./packages/loot-core/src/server/cloud-storage.ts");
-            /* harmony import */ var _dashboard_app__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ./dashboard/app */ "./packages/loot-core/src/server/dashboard/app.ts");
-            /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(/*! ./db */ "./packages/loot-core/src/server/db/index.ts");
-            /* harmony import */ var _db_mappings__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(/*! ./db/mappings */ "./packages/loot-core/src/server/db/mappings.ts");
-            /* harmony import */ var _encryption__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(/*! ./encryption */ "./packages/loot-core/src/server/encryption.ts");
-            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(/*! ./errors */ "./packages/loot-core/src/server/errors.ts");
-            /* harmony import */ var _filters_app__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(/*! ./filters/app */ "./packages/loot-core/src/server/filters/app.ts");
-            /* harmony import */ var _importers__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(/*! ./importers */ "./packages/loot-core/src/server/importers/index.ts");
-            /* harmony import */ var _main_app__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(/*! ./main-app */ "./packages/loot-core/src/server/main-app.ts");
-            /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(/*! ./mutators */ "./packages/loot-core/src/server/mutators.ts");
-            /* harmony import */ var _notes_app__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(/*! ./notes/app */ "./packages/loot-core/src/server/notes/app.ts");
-            /* harmony import */ var _platform__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(/*! ./platform */ "./packages/loot-core/src/server/platform.ts");
-            /* harmony import */ var _post__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(/*! ./post */ "./packages/loot-core/src/server/post.ts");
-            /* harmony import */ var _preferences_app__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(/*! ./preferences/app */ "./packages/loot-core/src/server/preferences/app.ts");
-            /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(/*! ./prefs */ "./packages/loot-core/src/server/prefs.ts");
-            /* harmony import */ var _reports_app__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(/*! ./reports/app */ "./packages/loot-core/src/server/reports/app.ts");
-            /* harmony import */ var _rules_app__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(/*! ./rules/app */ "./packages/loot-core/src/server/rules/app.ts");
-            /* harmony import */ var _schedules_app__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(/*! ./schedules/app */ "./packages/loot-core/src/server/schedules/app.ts");
-            /* harmony import */ var _server_config__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(/*! ./server-config */ "./packages/loot-core/src/server/server-config.ts");
-            /* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(/*! ./sheet */ "./packages/loot-core/src/server/sheet.ts");
-            /* harmony import */ var _spreadsheet_util__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(/*! ./spreadsheet/util */ "./packages/loot-core/src/server/spreadsheet/util.ts");
-            /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.ts");
-            /* harmony import */ var _sync_migrate__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(/*! ./sync/migrate */ "./packages/loot-core/src/server/sync/migrate.ts");
-            /* harmony import */ var _tools_app__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(/*! ./tools/app */ "./packages/loot-core/src/server/tools/app.ts");
-            /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(/*! ./undo */ "./packages/loot-core/src/server/undo.ts");
-            /* harmony import */ var _update__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(/*! ./update */ "./packages/loot-core/src/server/update.ts");
-            /* harmony import */ var _util_budget_name__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(/*! ./util/budget-name */ "./packages/loot-core/src/server/util/budget-name.ts");
+            /* harmony import */ var _admin_app__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./admin/app */ "./packages/loot-core/src/server/admin/app.ts");
+            /* harmony import */ var _api__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./api */ "./packages/loot-core/src/server/api.ts");
+            /* harmony import */ var _aql__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ./aql */ "./packages/loot-core/src/server/aql/index.ts");
+            /* harmony import */ var _backups__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ./backups */ "./packages/loot-core/src/server/backups.ts");
+            /* harmony import */ var _budget_app__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./budget/app */ "./packages/loot-core/src/server/budget/app.ts");
+            /* harmony import */ var _budget_base__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ./budget/base */ "./packages/loot-core/src/server/budget/base.ts");
+            /* harmony import */ var _cloud_storage__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ./cloud-storage */ "./packages/loot-core/src/server/cloud-storage.ts");
+            /* harmony import */ var _dashboard_app__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(/*! ./dashboard/app */ "./packages/loot-core/src/server/dashboard/app.ts");
+            /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(/*! ./db */ "./packages/loot-core/src/server/db/index.ts");
+            /* harmony import */ var _db_mappings__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(/*! ./db/mappings */ "./packages/loot-core/src/server/db/mappings.ts");
+            /* harmony import */ var _encryption__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(/*! ./encryption */ "./packages/loot-core/src/server/encryption.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(/*! ./errors */ "./packages/loot-core/src/server/errors.ts");
+            /* harmony import */ var _filters_app__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(/*! ./filters/app */ "./packages/loot-core/src/server/filters/app.ts");
+            /* harmony import */ var _importers__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(/*! ./importers */ "./packages/loot-core/src/server/importers/index.ts");
+            /* harmony import */ var _main_app__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(/*! ./main-app */ "./packages/loot-core/src/server/main-app.ts");
+            /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(/*! ./mutators */ "./packages/loot-core/src/server/mutators.ts");
+            /* harmony import */ var _notes_app__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(/*! ./notes/app */ "./packages/loot-core/src/server/notes/app.ts");
+            /* harmony import */ var _platform__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(/*! ./platform */ "./packages/loot-core/src/server/platform.ts");
+            /* harmony import */ var _post__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(/*! ./post */ "./packages/loot-core/src/server/post.ts");
+            /* harmony import */ var _preferences_app__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(/*! ./preferences/app */ "./packages/loot-core/src/server/preferences/app.ts");
+            /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(/*! ./prefs */ "./packages/loot-core/src/server/prefs.ts");
+            /* harmony import */ var _reports_app__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(/*! ./reports/app */ "./packages/loot-core/src/server/reports/app.ts");
+            /* harmony import */ var _rules_app__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(/*! ./rules/app */ "./packages/loot-core/src/server/rules/app.ts");
+            /* harmony import */ var _schedules_app__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(/*! ./schedules/app */ "./packages/loot-core/src/server/schedules/app.ts");
+            /* harmony import */ var _server_config__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(/*! ./server-config */ "./packages/loot-core/src/server/server-config.ts");
+            /* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(/*! ./sheet */ "./packages/loot-core/src/server/sheet.ts");
+            /* harmony import */ var _spreadsheet_util__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(/*! ./spreadsheet/util */ "./packages/loot-core/src/server/spreadsheet/util.ts");
+            /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.ts");
+            /* harmony import */ var _sync_migrate__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(/*! ./sync/migrate */ "./packages/loot-core/src/server/sync/migrate.ts");
+            /* harmony import */ var _tools_app__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(/*! ./tools/app */ "./packages/loot-core/src/server/tools/app.ts");
+            /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(/*! ./undo */ "./packages/loot-core/src/server/undo.ts");
+            /* harmony import */ var _update__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(/*! ./update */ "./packages/loot-core/src/server/update.ts");
+            /* harmony import */ var _util_budget_name__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(/*! ./util/budget-name */ "./packages/loot-core/src/server/util/budget-name.ts");
             // @ts-strict-ignore
             const DEMO_BUDGET_ID = '_demo-budget';
             const TEST_BUDGET_ID = '_test-budget';
             // util
             function onSheetChange({ names }) {
                 const nodes = names.map((name) => {
-                    const node = _sheet__WEBPACK_IMPORTED_MODULE_45__.get()._getNode(name);
+                    const node = _sheet__WEBPACK_IMPORTED_MODULE_46__.get()._getNode(name);
                     return {
                         name: node.name,
                         value: node.value
@@ -45644,14 +45956,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             // need to work around the type system here because the object
             // is /currently/ empty but we promise to fill it in later
             let handlers = {};
-            handlers['undo'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function () {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.undo)();
+            handlers['undo'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function () {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.undo)();
             });
-            handlers['redo'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(function () {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.redo)();
+            handlers['redo'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(function () {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.redo)();
             });
-            handlers['transactions-batch-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ added, deleted, updated, learnCategories }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
+            handlers['transactions-batch-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ added, deleted, updated, learnCategories }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
                     const result = await (0, _accounts_transactions__WEBPACK_IMPORTED_MODULE_20__.batchUpdateTransactions)({
                         added,
                         updated,
@@ -45661,7 +45973,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return result;
                 });
             });
-            handlers['transaction-add'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function (transaction) {
+            handlers['transaction-add'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function (transaction) {
                 await handlers['transactions-batch-update']({
                     added: [
                         transaction
@@ -45669,7 +45981,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
                 return {};
             });
-            handlers['transaction-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function (transaction) {
+            handlers['transaction-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function (transaction) {
                 await handlers['transactions-batch-update']({
                     updated: [
                         transaction
@@ -45677,7 +45989,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
                 return {};
             });
-            handlers['transaction-delete'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function (transaction) {
+            handlers['transaction-delete'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function (transaction) {
                 await handlers['transactions-batch-update']({
                     deleted: [
                         transaction
@@ -45696,12 +46008,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             };
             handlers['get-categories'] = async function () {
                 return {
-                    grouped: await _db__WEBPACK_IMPORTED_MODULE_28__.getCategoriesGrouped(),
-                    list: await _db__WEBPACK_IMPORTED_MODULE_28__.getCategories()
+                    grouped: await _db__WEBPACK_IMPORTED_MODULE_29__.getCategoriesGrouped(),
+                    list: await _db__WEBPACK_IMPORTED_MODULE_29__.getCategories()
                 };
             };
             handlers['get-earliest-transaction'] = async function () {
-                const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_22__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_12__.q)('transactions').options({
+                const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_23__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_12__.q)('transactions').options({
                     splits: 'none'
                 }).orderBy({
                     date: 'asc'
@@ -45709,16 +46021,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return data[0] || null;
             };
             handlers['get-budget-bounds'] = async function () {
-                return _budget_base__WEBPACK_IMPORTED_MODULE_25__.createAllBudgets();
+                return _budget_base__WEBPACK_IMPORTED_MODULE_26__.createAllBudgets();
             };
             handlers['envelope-budget-month'] = async function ({ month }) {
-                const groups = await _db__WEBPACK_IMPORTED_MODULE_28__.getCategoriesGrouped();
+                const groups = await _db__WEBPACK_IMPORTED_MODULE_29__.getCategoriesGrouped();
                 const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_11__.sheetForMonth(month);
                 function value(name) {
-                    const v = _sheet__WEBPACK_IMPORTED_MODULE_45__.getCellValue(sheetName, name);
+                    const v = _sheet__WEBPACK_IMPORTED_MODULE_46__.getCellValue(sheetName, name);
                     return {
                         value: v === '' ? 0 : v,
-                        name: (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_46__.resolveName)(sheetName, name)
+                        name: (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_47__.resolveName)(sheetName, name)
                     };
                 }
                 let values = [
@@ -45760,13 +46072,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return values;
             };
             handlers['tracking-budget-month'] = async function ({ month }) {
-                const groups = await _db__WEBPACK_IMPORTED_MODULE_28__.getCategoriesGrouped();
+                const groups = await _db__WEBPACK_IMPORTED_MODULE_29__.getCategoriesGrouped();
                 const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_11__.sheetForMonth(month);
                 function value(name) {
-                    const v = _sheet__WEBPACK_IMPORTED_MODULE_45__.getCellValue(sheetName, name);
+                    const v = _sheet__WEBPACK_IMPORTED_MODULE_46__.getCellValue(sheetName, name);
                     return {
                         value: v === '' ? 0 : v,
-                        name: (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_46__.resolveName)(sheetName, name)
+                        name: (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_47__.resolveName)(sheetName, name)
                     };
                 }
                 let values = [
@@ -45799,12 +46111,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return values;
             };
-            handlers['category-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ name, groupId, isIncome, hidden }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
+            handlers['category-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ name, groupId, isIncome, hidden }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
                     if (!groupId) {
-                        throw (0, _errors__WEBPACK_IMPORTED_MODULE_31__.APIError)('Creating a category: groupId is required');
+                        throw (0, _errors__WEBPACK_IMPORTED_MODULE_32__.APIError)('Creating a category: groupId is required');
                     }
-                    return _db__WEBPACK_IMPORTED_MODULE_28__.insertCategory({
+                    return _db__WEBPACK_IMPORTED_MODULE_29__.insertCategory({
                         name: name.trim(),
                         cat_group: groupId,
                         is_income: isIncome ? 1 : 0,
@@ -45812,10 +46124,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                 });
             });
-            handlers['category-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function (category) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
+            handlers['category-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function (category) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
                     try {
-                        await _db__WEBPACK_IMPORTED_MODULE_28__.updateCategory({
+                        await _db__WEBPACK_IMPORTED_MODULE_29__.updateCategory({
                             ...category,
                             name: category.name.trim()
                         });
@@ -45833,19 +46145,19 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return {};
                 });
             });
-            handlers['category-move'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ id, groupId, targetId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
-                    await (0, _sync__WEBPACK_IMPORTED_MODULE_47__.batchMessages)(async () => {
-                        await _db__WEBPACK_IMPORTED_MODULE_28__.moveCategory(id, groupId, targetId);
+            handlers['category-move'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ id, groupId, targetId }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                    await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.batchMessages)(async () => {
+                        await _db__WEBPACK_IMPORTED_MODULE_29__.moveCategory(id, groupId, targetId);
                     });
                     return 'ok';
                 });
             });
-            handlers['category-delete'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ id, transferId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
+            handlers['category-delete'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ id, transferId }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
                     let result = {};
-                    await (0, _sync__WEBPACK_IMPORTED_MODULE_47__.batchMessages)(async () => {
-                        const row = await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT is_income FROM categories WHERE id = ?', [
+                    await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.batchMessages)(async () => {
+                        const row = await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT is_income FROM categories WHERE id = ?', [
                             id
                         ]);
                         if (!row) {
@@ -45854,7 +46166,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             };
                             return;
                         }
-                        const transfer = transferId && await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT is_income FROM categories WHERE id = ?', [
+                        const transfer = transferId && await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT is_income FROM categories WHERE id = ?', [
                             transferId
                         ]);
                         if (!row || transferId && !transfer) {
@@ -45873,12 +46185,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         // TODO: We should do this for income too if it's a reflect budget
                         if (row.is_income === 0) {
                             if (transferId) {
-                                await _budget_base__WEBPACK_IMPORTED_MODULE_25__.doTransfer([
+                                await _budget_base__WEBPACK_IMPORTED_MODULE_26__.doTransfer([
                                     id
                                 ], transferId);
                             }
                         }
-                        await _db__WEBPACK_IMPORTED_MODULE_28__.deleteCategory({
+                        await _db__WEBPACK_IMPORTED_MODULE_29__.deleteCategory({
                             id
                         }, transferId);
                     });
@@ -45886,46 +46198,46 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['get-category-groups'] = async function () {
-                return await _db__WEBPACK_IMPORTED_MODULE_28__.getCategoriesGrouped();
+                return await _db__WEBPACK_IMPORTED_MODULE_29__.getCategoriesGrouped();
             };
-            handlers['category-group-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ name, isIncome }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
-                    return _db__WEBPACK_IMPORTED_MODULE_28__.insertCategoryGroup({
+            handlers['category-group-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ name, isIncome }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                    return _db__WEBPACK_IMPORTED_MODULE_29__.insertCategoryGroup({
                         name,
                         is_income: isIncome ? 1 : 0
                     });
                 });
             });
-            handlers['category-group-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function (group) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
-                    return _db__WEBPACK_IMPORTED_MODULE_28__.updateCategoryGroup(group);
+            handlers['category-group-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function (group) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                    return _db__WEBPACK_IMPORTED_MODULE_29__.updateCategoryGroup(group);
                 });
             });
-            handlers['category-group-move'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ id, targetId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
-                    await (0, _sync__WEBPACK_IMPORTED_MODULE_47__.batchMessages)(async () => {
-                        await _db__WEBPACK_IMPORTED_MODULE_28__.moveCategoryGroup(id, targetId);
+            handlers['category-group-move'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ id, targetId }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                    await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.batchMessages)(async () => {
+                        await _db__WEBPACK_IMPORTED_MODULE_29__.moveCategoryGroup(id, targetId);
                     });
                     return 'ok';
                 });
             });
-            handlers['category-group-delete'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ id, transferId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
-                    const groupCategories = await _db__WEBPACK_IMPORTED_MODULE_28__.all('SELECT id FROM categories WHERE cat_group = ? AND tombstone = 0', [
+            handlers['category-group-delete'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ id, transferId }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                    const groupCategories = await _db__WEBPACK_IMPORTED_MODULE_29__.all('SELECT id FROM categories WHERE cat_group = ? AND tombstone = 0', [
                         id
                     ]);
-                    return (0, _sync__WEBPACK_IMPORTED_MODULE_47__.batchMessages)(async () => {
+                    return (0, _sync__WEBPACK_IMPORTED_MODULE_48__.batchMessages)(async () => {
                         if (transferId) {
-                            await _budget_base__WEBPACK_IMPORTED_MODULE_25__.doTransfer(groupCategories.map((c) => c.id), transferId);
+                            await _budget_base__WEBPACK_IMPORTED_MODULE_26__.doTransfer(groupCategories.map((c) => c.id), transferId);
                         }
-                        await _db__WEBPACK_IMPORTED_MODULE_28__.deleteCategoryGroup({
+                        await _db__WEBPACK_IMPORTED_MODULE_29__.deleteCategoryGroup({
                             id
                         }, transferId);
                     });
                 });
             });
             handlers['must-category-transfer'] = async function ({ id }) {
-                const res = await _db__WEBPACK_IMPORTED_MODULE_28__.runQuery(`SELECT count(t.id) as count FROM transactions t
+                const res = await _db__WEBPACK_IMPORTED_MODULE_29__.runQuery(`SELECT count(t.id) as count FROM transactions t
        LEFT JOIN category_mapping cm ON cm.id = t.category
        WHERE cm.transferId = ? AND t.tombstone = 0`, [
                     id
@@ -45938,28 +46250,28 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // If there are any non-zero budget values, also force the user to
                 // transfer the category.
                 return [
-                    ..._sheet__WEBPACK_IMPORTED_MODULE_45__.get().meta().createdMonths
+                    ..._sheet__WEBPACK_IMPORTED_MODULE_46__.get().meta().createdMonths
                 ].some((month) => {
                     const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_11__.sheetForMonth(month);
-                    const value = _sheet__WEBPACK_IMPORTED_MODULE_45__.get().getCellValue(sheetName, 'budget-' + id);
+                    const value = _sheet__WEBPACK_IMPORTED_MODULE_46__.get().getCellValue(sheetName, 'budget-' + id);
                     return value != null && value !== 0;
                 });
             };
-            handlers['payee-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ name }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
-                    return _db__WEBPACK_IMPORTED_MODULE_28__.insertPayee({
+            handlers['payee-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ name }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                    return _db__WEBPACK_IMPORTED_MODULE_29__.insertPayee({
                         name
                     });
                 });
             });
             handlers['common-payees-get'] = async function () {
-                return _db__WEBPACK_IMPORTED_MODULE_28__.getCommonPayees();
+                return _db__WEBPACK_IMPORTED_MODULE_29__.getCommonPayees();
             };
             handlers['payees-get'] = async function () {
-                return _db__WEBPACK_IMPORTED_MODULE_28__.getPayees();
+                return _db__WEBPACK_IMPORTED_MODULE_29__.getPayees();
             };
             handlers['payees-get-orphaned'] = async function () {
-                return _db__WEBPACK_IMPORTED_MODULE_28__.syncGetOrphanedPayees();
+                return _db__WEBPACK_IMPORTED_MODULE_29__.syncGetOrphanedPayees();
             };
             handlers['payees-get-rule-counts'] = async function () {
                 const payeeCounts = {};
@@ -45971,31 +46283,31 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
                 return payeeCounts;
             };
-            handlers['payees-merge'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ targetId, mergeIds }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
-                    return _db__WEBPACK_IMPORTED_MODULE_28__.mergePayees(targetId, mergeIds);
+            handlers['payees-merge'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ targetId, mergeIds }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                    return _db__WEBPACK_IMPORTED_MODULE_29__.mergePayees(targetId, mergeIds);
                 }, {
                     targetId,
                     mergeIds
                 });
             });
-            handlers['payees-batch-change'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ added, deleted, updated }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
-                    return (0, _sync__WEBPACK_IMPORTED_MODULE_47__.batchMessages)(async () => {
+            handlers['payees-batch-change'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ added, deleted, updated }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                    return (0, _sync__WEBPACK_IMPORTED_MODULE_48__.batchMessages)(async () => {
                         if (deleted) {
-                            await Promise.all(deleted.map((p) => _db__WEBPACK_IMPORTED_MODULE_28__.deletePayee(p)));
+                            await Promise.all(deleted.map((p) => _db__WEBPACK_IMPORTED_MODULE_29__.deletePayee(p)));
                         }
                         if (added) {
-                            await Promise.all(added.map((p) => _db__WEBPACK_IMPORTED_MODULE_28__.insertPayee(p)));
+                            await Promise.all(added.map((p) => _db__WEBPACK_IMPORTED_MODULE_29__.insertPayee(p)));
                         }
                         if (updated) {
-                            await Promise.all(updated.map((p) => _db__WEBPACK_IMPORTED_MODULE_28__.updatePayee(p)));
+                            await Promise.all(updated.map((p) => _db__WEBPACK_IMPORTED_MODULE_29__.updatePayee(p)));
                         }
                     });
                 });
             });
             handlers['payees-check-orphaned'] = async function ({ ids }) {
-                const orphaned = new Set(await _db__WEBPACK_IMPORTED_MODULE_28__.getOrphanedPayees());
+                const orphaned = new Set(await _db__WEBPACK_IMPORTED_MODULE_29__.getOrphanedPayees());
                 return ids.filter((id) => orphaned.has(id));
             };
             handlers['payees-get-rules'] = async function ({ id }) {
@@ -46005,37 +46317,21 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_19__.conditionsToAQL(conditions);
             };
             handlers['getCell'] = async function ({ sheetName, name }) {
-                // Fields is no longer used - hardcode
-                const fields = [
-                    'name',
-                    'value'
-                ];
-                const node = _sheet__WEBPACK_IMPORTED_MODULE_45__.get()._getNode((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_46__.resolveName)(sheetName, name));
-                if (fields) {
-                    const res = {};
-                    fields.forEach((field) => {
-                        if (field === 'run') {
-                            res[field] = node._run ? node._run.toString() : null;
-                        }
-                        else {
-                            res[field] = node[field];
-                        }
-                    });
-                    return res;
-                }
-                else {
-                    return node;
-                }
+                const node = _sheet__WEBPACK_IMPORTED_MODULE_46__.get()._getNode((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_47__.resolveName)(sheetName, name));
+                return {
+                    name: node.name,
+                    value: node.value
+                };
             };
             handlers['getCells'] = async function ({ names }) {
                 return names.map((name) => ({
-                    value: _sheet__WEBPACK_IMPORTED_MODULE_45__.get()._getNode(name).value
+                    value: _sheet__WEBPACK_IMPORTED_MODULE_46__.get()._getNode(name).value
                 }));
             };
             handlers['getCellNamesInSheet'] = async function ({ sheetName }) {
                 const names = [];
-                for (const name of _sheet__WEBPACK_IMPORTED_MODULE_45__.get().getNodes().keys()) {
-                    const { sheet: nodeSheet, name: nodeName } = (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_46__.unresolveName)(name);
+                for (const name of _sheet__WEBPACK_IMPORTED_MODULE_46__.get().getNodes().keys()) {
+                    const { sheet: nodeSheet, name: nodeName } = (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_47__.unresolveName)(name);
                     if (nodeSheet === sheetName) {
                         names.push(nodeName);
                     }
@@ -46043,7 +46339,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return names;
             };
             handlers['debugCell'] = async function ({ sheetName, name }) {
-                const node = _sheet__WEBPACK_IMPORTED_MODULE_45__.get().getNode((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_46__.resolveName)(sheetName, name));
+                const node = _sheet__WEBPACK_IMPORTED_MODULE_46__.get().getNode((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_47__.resolveName)(sheetName, name));
                 return {
                     ...node,
                     _run: node._run && node._run.toString()
@@ -46052,18 +46348,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             handlers['create-query'] = async function ({ sheetName, name, query }) {
                 // Always run it regardless of cache. We don't know anything has changed
                 // between the cache value being saved and now
-                _sheet__WEBPACK_IMPORTED_MODULE_45__.get().createQuery(sheetName, name, query);
+                _sheet__WEBPACK_IMPORTED_MODULE_46__.get().createQuery(sheetName, name, query);
                 return 'ok';
             };
             handlers['query'] = async function (query) {
                 if (query.table == null) {
                     throw new Error('query has no table, did you forgot to call `.serialize`?');
                 }
-                return (0, _aql__WEBPACK_IMPORTED_MODULE_22__.runQuery)(query);
+                return (0, _aql__WEBPACK_IMPORTED_MODULE_23__.runQuery)(query);
             };
-            handlers['account-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ id, name }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
-                    await _db__WEBPACK_IMPORTED_MODULE_28__.update('accounts', {
+            handlers['account-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ id, name }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                    await _db__WEBPACK_IMPORTED_MODULE_29__.update('accounts', {
                         id,
                         name
                     });
@@ -46071,20 +46367,20 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['accounts-get'] = async function () {
-                return _db__WEBPACK_IMPORTED_MODULE_28__.getAccounts();
+                return _db__WEBPACK_IMPORTED_MODULE_29__.getAccounts();
             };
             handlers['account-balance'] = async function ({ id, cutoff }) {
-                const { balance } = await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT sum(amount) as balance FROM transactions WHERE acct = ? AND isParent = 0 AND tombstone = 0 AND date <= ?', [
+                const { balance } = await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT sum(amount) as balance FROM transactions WHERE acct = ? AND isParent = 0 AND tombstone = 0 AND date <= ?', [
                     id,
-                    _db__WEBPACK_IMPORTED_MODULE_28__.toDateRepr((0, _shared_months__WEBPACK_IMPORTED_MODULE_11__.dayFromDate)(cutoff))
+                    _db__WEBPACK_IMPORTED_MODULE_29__.toDateRepr((0, _shared_months__WEBPACK_IMPORTED_MODULE_11__.dayFromDate)(cutoff))
                 ]);
                 return balance ? balance : 0;
             };
             handlers['account-properties'] = async function ({ id }) {
-                const { balance } = await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT sum(amount) as balance FROM transactions WHERE acct = ? AND isParent = 0 AND tombstone = 0', [
+                const { balance } = await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT sum(amount) as balance FROM transactions WHERE acct = ? AND isParent = 0 AND tombstone = 0', [
                     id
                 ]);
-                const { count } = await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT count(id) as count FROM transactions WHERE acct = ? AND tombstone = 0', [
+                const { count } = await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT count(id) as count FROM transactions WHERE acct = ? AND tombstone = 0', [
                     id
                 ]);
                 return {
@@ -46096,11 +46392,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 let id;
                 const bank = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.findOrCreateBank(account.institution, requisitionId);
                 if (upgradingId) {
-                    const accRow = await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT * FROM accounts WHERE id = ?', [
+                    const accRow = await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT * FROM accounts WHERE id = ?', [
                         upgradingId
                     ]);
                     id = accRow.id;
-                    await _db__WEBPACK_IMPORTED_MODULE_28__.update('accounts', {
+                    await _db__WEBPACK_IMPORTED_MODULE_29__.update('accounts', {
                         id,
                         account_id: account.account_id,
                         bank: bank.id,
@@ -46108,8 +46404,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                 }
                 else {
-                    id = (0, uuid__WEBPACK_IMPORTED_MODULE_53__["default"])();
-                    await _db__WEBPACK_IMPORTED_MODULE_28__.insertWithUUID('accounts', {
+                    id = (0, uuid__WEBPACK_IMPORTED_MODULE_54__["default"])();
+                    await _db__WEBPACK_IMPORTED_MODULE_29__.insertWithUUID('accounts', {
                         id,
                         account_id: account.account_id,
                         mask: account.mask,
@@ -46119,7 +46415,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         offbudget: offBudget ? 1 : 0,
                         account_sync_source: 'goCardless'
                     });
-                    await _db__WEBPACK_IMPORTED_MODULE_28__.insertPayee({
+                    await _db__WEBPACK_IMPORTED_MODULE_29__.insertPayee({
                         name: '',
                         transfer_acct: id
                     });
@@ -46140,11 +46436,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 };
                 const bank = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.findOrCreateBank(institution, externalAccount.orgDomain ?? externalAccount.orgId);
                 if (upgradingId) {
-                    const accRow = await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT * FROM accounts WHERE id = ?', [
+                    const accRow = await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT * FROM accounts WHERE id = ?', [
                         upgradingId
                     ]);
                     id = accRow.id;
-                    await _db__WEBPACK_IMPORTED_MODULE_28__.update('accounts', {
+                    await _db__WEBPACK_IMPORTED_MODULE_29__.update('accounts', {
                         id,
                         account_id: externalAccount.account_id,
                         bank: bank.id,
@@ -46152,8 +46448,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                 }
                 else {
-                    id = (0, uuid__WEBPACK_IMPORTED_MODULE_53__["default"])();
-                    await _db__WEBPACK_IMPORTED_MODULE_28__.insertWithUUID('accounts', {
+                    id = (0, uuid__WEBPACK_IMPORTED_MODULE_54__["default"])();
+                    await _db__WEBPACK_IMPORTED_MODULE_29__.insertWithUUID('accounts', {
                         id,
                         account_id: externalAccount.account_id,
                         name: externalAccount.name,
@@ -46162,7 +46458,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         offbudget: offBudget ? 1 : 0,
                         account_sync_source: 'simpleFin'
                     });
-                    await _db__WEBPACK_IMPORTED_MODULE_28__.insertPayee({
+                    await _db__WEBPACK_IMPORTED_MODULE_29__.insertPayee({
                         name: '',
                         transfer_acct: id
                     });
@@ -46176,20 +46472,20 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
                 return 'ok';
             };
-            handlers['account-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ name, balance, offBudget, closed }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
-                    const id = await _db__WEBPACK_IMPORTED_MODULE_28__.insertAccount({
+            handlers['account-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ name, balance, offBudget, closed }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                    const id = await _db__WEBPACK_IMPORTED_MODULE_29__.insertAccount({
                         name,
                         offbudget: offBudget ? 1 : 0,
                         closed: closed ? 1 : 0
                     });
-                    await _db__WEBPACK_IMPORTED_MODULE_28__.insertPayee({
+                    await _db__WEBPACK_IMPORTED_MODULE_29__.insertPayee({
                         name: '',
                         transfer_acct: id
                     });
                     if (balance != null && balance !== 0) {
                         const payee = await (0, _accounts_payees__WEBPACK_IMPORTED_MODULE_17__.getStartingBalancePayee)();
-                        await _db__WEBPACK_IMPORTED_MODULE_28__.insertTransaction({
+                        await _db__WEBPACK_IMPORTED_MODULE_29__.insertTransaction({
                             account: id,
                             amount: (0, _shared_util__WEBPACK_IMPORTED_MODULE_13__.amountToInteger)(balance),
                             category: offBudget ? null : payee.category,
@@ -46202,15 +46498,15 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return id;
                 });
             });
-            handlers['account-close'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ id, transferAccountId, categoryId, forced }) {
+            handlers['account-close'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ id, transferAccountId, categoryId, forced }) {
                 // Unlink the account if it's linked. This makes sure to remove it from
                 // bank-sync providers. (This should not be undo-able, as it mutates the
                 // remote server and the user will have to link the account again)
                 await handlers['account-unlink']({
                     id
                 });
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
-                    const account = await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT * FROM accounts WHERE id = ? AND tombstone = 0', [
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                    const account = await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT * FROM accounts WHERE id = ? AND tombstone = 0', [
                         id
                     ]);
                     // Do nothing if the account doesn't exist or it's already been
@@ -46223,18 +46519,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                     // If there are no transactions, we can simply delete the account
                     if (numTransactions === 0) {
-                        await _db__WEBPACK_IMPORTED_MODULE_28__.deleteAccount({
+                        await _db__WEBPACK_IMPORTED_MODULE_29__.deleteAccount({
                             id
                         });
                     }
                     else if (forced) {
-                        const rows = await _db__WEBPACK_IMPORTED_MODULE_28__.runQuery('SELECT id, transfer_id FROM v_transactions WHERE account = ?', [
+                        const rows = await _db__WEBPACK_IMPORTED_MODULE_29__.runQuery('SELECT id, transfer_id FROM v_transactions WHERE account = ?', [
                             id
                         ], true);
-                        const { id: payeeId } = await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT id FROM payees WHERE transfer_acct = ?', [
+                        const { id: payeeId } = await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT id FROM payees WHERE transfer_acct = ?', [
                             id
                         ]);
-                        await (0, _sync__WEBPACK_IMPORTED_MODULE_47__.batchMessages)(async () => {
+                        await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.batchMessages)(async () => {
                             // TODO: what this should really do is send a special message that
                             // automatically marks the tombstone value for all transactions
                             // within an account... or something? This is problematic
@@ -46242,40 +46538,40 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             // should be marked as deleted.
                             rows.forEach((row) => {
                                 if (row.transfer_id) {
-                                    _db__WEBPACK_IMPORTED_MODULE_28__.updateTransaction({
+                                    _db__WEBPACK_IMPORTED_MODULE_29__.updateTransaction({
                                         id: row.transfer_id,
                                         payee: null,
                                         transfer_id: null
                                     });
                                 }
-                                _db__WEBPACK_IMPORTED_MODULE_28__.deleteTransaction({
+                                _db__WEBPACK_IMPORTED_MODULE_29__.deleteTransaction({
                                     id: row.id
                                 });
                             });
-                            _db__WEBPACK_IMPORTED_MODULE_28__.deleteAccount({
+                            _db__WEBPACK_IMPORTED_MODULE_29__.deleteAccount({
                                 id
                             });
-                            _db__WEBPACK_IMPORTED_MODULE_28__.deleteTransferPayee({
+                            _db__WEBPACK_IMPORTED_MODULE_29__.deleteTransferPayee({
                                 id: payeeId
                             });
                         });
                     }
                     else {
                         if (balance !== 0 && transferAccountId == null) {
-                            throw (0, _errors__WEBPACK_IMPORTED_MODULE_31__.APIError)('balance is non-zero: transferAccountId is required');
+                            throw (0, _errors__WEBPACK_IMPORTED_MODULE_32__.APIError)('balance is non-zero: transferAccountId is required');
                         }
-                        await _db__WEBPACK_IMPORTED_MODULE_28__.update('accounts', {
+                        await _db__WEBPACK_IMPORTED_MODULE_29__.update('accounts', {
                             id,
                             closed: 1
                         });
                         // If there is a balance we need to transfer it to the specified
                         // account (and possibly categorize it)
                         if (balance !== 0) {
-                            const { id: payeeId } = await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT id FROM payees WHERE transfer_acct = ?', [
+                            const { id: payeeId } = await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT id FROM payees WHERE transfer_acct = ?', [
                                 transferAccountId
                             ]);
                             await handlers['transaction-add']({
-                                id: (0, uuid__WEBPACK_IMPORTED_MODULE_53__["default"])(),
+                                id: (0, uuid__WEBPACK_IMPORTED_MODULE_54__["default"])(),
                                 payee: payeeId,
                                 amount: -balance,
                                 account: id,
@@ -46287,17 +46583,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 });
             });
-            handlers['account-reopen'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ id }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
-                    await _db__WEBPACK_IMPORTED_MODULE_28__.update('accounts', {
+            handlers['account-reopen'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ id }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                    await _db__WEBPACK_IMPORTED_MODULE_29__.update('accounts', {
                         id,
                         closed: 0
                     });
                 });
             });
-            handlers['account-move'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ id, targetId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
-                    await _db__WEBPACK_IMPORTED_MODULE_28__.moveAccount(id, targetId);
+            handlers['account-move'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ id, targetId }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                    await _db__WEBPACK_IMPORTED_MODULE_29__.moveAccount(id, targetId);
                 });
             });
             let stopPolling = false;
@@ -46309,7 +46605,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    return await (0, _post__WEBPACK_IMPORTED_MODULE_38__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().BASE_SERVER + '/secret', {
+                    return await (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().BASE_SERVER + '/secret', {
                         name,
                         value
                     }, {
@@ -46317,9 +46613,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                 }
                 catch (error) {
-                    console.error(error);
                     return {
-                        error: 'failed'
+                        error: 'failed',
+                        reason: error.reason
                     };
                 }
             };
@@ -46331,7 +46627,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    return await (0, _post__WEBPACK_IMPORTED_MODULE_38__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().BASE_SERVER + '/secret/' + name, {
+                    return await (0, _post__WEBPACK_IMPORTED_MODULE_39__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().BASE_SERVER + '/secret/' + name, {
                         'X-ACTUAL-TOKEN': userToken
                     });
                 }
@@ -46358,7 +46654,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         cb('timeout');
                         return;
                     }
-                    const data = await (0, _post__WEBPACK_IMPORTED_MODULE_38__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().GOCARDLESS_SERVER + '/get-accounts', {
+                    const data = await (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().GOCARDLESS_SERVER + '/get-accounts', {
                         upgradingAccountId,
                         requisitionId
                     }, {
@@ -46398,7 +46694,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         error: 'unauthorized'
                     };
                 }
-                return (0, _post__WEBPACK_IMPORTED_MODULE_38__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().GOCARDLESS_SERVER + '/status', {}, {
+                return (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().GOCARDLESS_SERVER + '/status', {}, {
                     'X-ACTUAL-TOKEN': userToken
                 });
             };
@@ -46409,7 +46705,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         error: 'unauthorized'
                     };
                 }
-                return (0, _post__WEBPACK_IMPORTED_MODULE_38__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().SIMPLEFIN_SERVER + '/status', {}, {
+                return (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SIMPLEFIN_SERVER + '/status', {}, {
                     'X-ACTUAL-TOKEN': userToken
                 });
             };
@@ -46421,7 +46717,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    return await (0, _post__WEBPACK_IMPORTED_MODULE_38__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().SIMPLEFIN_SERVER + '/accounts', {}, {
+                    return await (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SIMPLEFIN_SERVER + '/accounts', {}, {
                         'X-ACTUAL-TOKEN': userToken
                     }, 60000);
                 }
@@ -46438,7 +46734,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         error: 'unauthorized'
                     };
                 }
-                return (0, _post__WEBPACK_IMPORTED_MODULE_38__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().GOCARDLESS_SERVER + '/get-banks', {
+                return (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().GOCARDLESS_SERVER + '/get-banks', {
                     country,
                     showDemo: (0, _shared_environment__WEBPACK_IMPORTED_MODULE_10__.isNonProductionEnvironment)()
                 }, {
@@ -46457,7 +46753,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    return await (0, _post__WEBPACK_IMPORTED_MODULE_38__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().GOCARDLESS_SERVER + '/create-web-token', {
+                    return await (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().GOCARDLESS_SERVER + '/create-web-token', {
                         upgradingAccountId,
                         institutionId,
                         accessValidForDays
@@ -46476,7 +46772,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const { added, updated } = res;
                 newTransactions.push(...added);
                 matchedTransactions.push(...updated);
-                if (added.length > 0 || updated.length > 0) {
+                if (added.length > 0) {
                     updatedAccounts.push(acct.id);
                 }
             }
@@ -46490,7 +46786,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         code: err.code
                     };
                 }
-                if (err instanceof _errors__WEBPACK_IMPORTED_MODULE_31__.PostError && err.reason !== 'internal') {
+                if (err instanceof _errors__WEBPACK_IMPORTED_MODULE_32__.PostError && err.reason !== 'internal') {
                     return {
                         accountId: acct.id,
                         message: err.reason ? err.reason : `Account “${acct.name}” is not linked properly. Please link it again.`
@@ -46507,8 +46803,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     'user-id',
                     'user-key'
                 ]);
-                const accounts = await _db__WEBPACK_IMPORTED_MODULE_28__.runQuery(`
-    SELECT a.*, b.bank_id as bankId 
+                const accounts = await _db__WEBPACK_IMPORTED_MODULE_29__.runQuery(`
+    SELECT a.*, b.bank_id as bankId
     FROM accounts a
     LEFT JOIN banks b ON a.bank = b.id
     WHERE a.tombstone = 0 AND a.closed = 0
@@ -46553,7 +46849,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 };
             };
             handlers['simplefin-batch-sync'] = async function ({ ids = [] }) {
-                const accounts = await _db__WEBPACK_IMPORTED_MODULE_28__.runQuery(`SELECT a.*, b.bank_id as bankId FROM accounts a
+                const accounts = await _db__WEBPACK_IMPORTED_MODULE_29__.runQuery(`SELECT a.*, b.bank_id as bankId FROM accounts a
          LEFT JOIN banks b ON a.bank = b.id
          WHERE
           a.tombstone = 0
@@ -46561,36 +46857,53 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
           AND a.account_sync_source = 'simpleFin'
           ${ids.length ? `AND a.id IN (${ids.map(() => '?').join(', ')})` : ''}
          ORDER BY a.offbudget, a.sort_order`, ids.length ? ids : [], true);
-                console.group('Bank Sync operation for all SimpleFin accounts');
-                const res = await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.SimpleFinBatchSync(accounts.map((a) => ({
-                    id: a.id,
-                    accountId: a.account_id
-                })));
                 const retVal = [];
-                for (const account of res) {
-                    const errors = [];
-                    const newTransactions = [];
-                    const matchedTransactions = [];
-                    const updatedAccounts = [];
-                    if (account.res.error_code) {
-                        errors.push(handleSyncError({
-                            type: 'BankSyncError',
-                            category: account.res.error_type,
-                            code: account.res.error_code
-                        }, accounts.find((a) => a.id === account.accountId)));
+                console.group('Bank Sync operation for all SimpleFin accounts');
+                try {
+                    const res = await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.SimpleFinBatchSync(accounts.map((a) => ({
+                        id: a.id,
+                        accountId: a.account_id
+                    })));
+                    for (const account of res) {
+                        const errors = [];
+                        const newTransactions = [];
+                        const matchedTransactions = [];
+                        const updatedAccounts = [];
+                        if (account.res.error_code) {
+                            errors.push(handleSyncError({
+                                type: 'BankSyncError',
+                                category: account.res.error_type,
+                                code: account.res.error_code
+                            }, accounts.find((a) => a.id === account.accountId)));
+                        }
+                        else {
+                            handleSyncResponse(account.res, accounts.find((a) => a.id === account.accountId), newTransactions, matchedTransactions, updatedAccounts);
+                        }
+                        retVal.push({
+                            accountId: account.accountId,
+                            res: {
+                                errors,
+                                newTransactions,
+                                matchedTransactions,
+                                updatedAccounts
+                            }
+                        });
                     }
-                    else {
-                        handleSyncResponse(account.res, accounts.find((a) => a.id === account.accountId), newTransactions, matchedTransactions, updatedAccounts);
+                }
+                catch (err) {
+                    const errors = [];
+                    for (const account of accounts) {
+                        retVal.push({
+                            accountId: account.accountId,
+                            res: {
+                                errors,
+                                newTransactions: [],
+                                matchedTransactions: [],
+                                updatedAccounts: []
+                            }
+                        });
+                        errors.push(handleSyncError(err, account));
                     }
-                    retVal.push({
-                        accountId: account.accountId,
-                        res: {
-                            errors,
-                            newTransactions,
-                            matchedTransactions,
-                            updatedAccounts
-                        }
-                    });
                 }
                 if (retVal.some((a) => a.res.updatedAccounts.length > 0)) {
                     _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.send('sync-event', {
@@ -46603,16 +46916,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 console.groupEnd();
                 return retVal;
             };
-            handlers['transactions-import'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(function ({ accountId, transactions, isPreview }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_50__.withUndo)(async () => {
+            handlers['transactions-import'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(function ({ accountId, transactions, isPreview }) {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
                     if (typeof accountId !== 'string') {
-                        throw (0, _errors__WEBPACK_IMPORTED_MODULE_31__.APIError)('transactions-import: accountId must be an id');
+                        throw (0, _errors__WEBPACK_IMPORTED_MODULE_32__.APIError)('transactions-import: accountId must be an id');
                     }
                     try {
                         return await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.reconcileTransactions(accountId, transactions, false, true, isPreview);
                     }
                     catch (err) {
-                        if (err instanceof _errors__WEBPACK_IMPORTED_MODULE_31__.TransactionError) {
+                        if (err instanceof _errors__WEBPACK_IMPORTED_MODULE_32__.TransactionError) {
                             return {
                                 errors: [
                                     {
@@ -46628,18 +46941,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 });
             });
-            handlers['account-unlink'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function ({ id }) {
-                const { bank: bankId } = await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT bank FROM accounts WHERE id = ?', [
+            handlers['account-unlink'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function ({ id }) {
+                const { bank: bankId } = await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT bank FROM accounts WHERE id = ?', [
                     id
                 ]);
                 if (!bankId) {
                     return 'ok';
                 }
-                const accRow = await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT * FROM accounts WHERE id = ?', [
+                const accRow = await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT * FROM accounts WHERE id = ?', [
                     id
                 ]);
                 const isGoCardless = accRow.account_sync_source === 'goCardless';
-                await _db__WEBPACK_IMPORTED_MODULE_28__.updateAccount({
+                await _db__WEBPACK_IMPORTED_MODULE_29__.updateAccount({
                     id,
                     account_id: null,
                     bank: null,
@@ -46651,7 +46964,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (isGoCardless === false) {
                     return;
                 }
-                const { count } = await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT COUNT(*) as count FROM accounts WHERE bank = ?', [
+                const { count } = await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT COUNT(*) as count FROM accounts WHERE bank = ?', [
                     bankId
                 ]);
                 // No more accounts are associated with this bank. We can remove
@@ -46661,11 +46974,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return 'ok';
                 }
                 if (count === 0) {
-                    const { bank_id: requisitionId } = await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT bank_id FROM banks WHERE id = ?', [
+                    const { bank_id: requisitionId } = await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT bank_id FROM banks WHERE id = ?', [
                         bankId
                     ]);
                     try {
-                        await (0, _post__WEBPACK_IMPORTED_MODULE_38__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().GOCARDLESS_SERVER + '/remove-account', {
+                        await (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().GOCARDLESS_SERVER + '/remove-account', {
                             requisitionId
                         }, {
                             'X-ACTUAL-TOKEN': userToken
@@ -46723,51 +47036,51 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 };
             };
             handlers['save-prefs'] = async function (prefsToSet) {
-                const { cloudFileId } = _prefs__WEBPACK_IMPORTED_MODULE_40__.getPrefs();
+                const { cloudFileId } = _prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs();
                 // Need to sync the budget name on the server as well
                 if (prefsToSet.budgetName && cloudFileId) {
                     const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('user-token');
-                    await (0, _post__WEBPACK_IMPORTED_MODULE_38__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().SYNC_SERVER + '/update-user-filename', {
+                    await (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SYNC_SERVER + '/update-user-filename', {
                         token: userToken,
                         fileId: cloudFileId,
                         name: prefsToSet.budgetName
                     });
                 }
-                await _prefs__WEBPACK_IMPORTED_MODULE_40__.savePrefs(prefsToSet);
+                await _prefs__WEBPACK_IMPORTED_MODULE_41__.savePrefs(prefsToSet);
                 return 'ok';
             };
             handlers['load-prefs'] = async function () {
-                return _prefs__WEBPACK_IMPORTED_MODULE_40__.getPrefs();
+                return _prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs();
             };
             handlers['sync-reset'] = async function () {
-                return await (0, _sync__WEBPACK_IMPORTED_MODULE_47__.resetSync)();
+                return await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.resetSync)();
             };
             handlers['sync-repair'] = async function () {
-                await (0, _sync__WEBPACK_IMPORTED_MODULE_47__.repairSync)();
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.repairSync)();
             };
             // A user can only enable/change their key with the file loaded. This
             // will change in the future: during onboarding the user should be
             // able to enable encryption. (Imagine if they are importing data from
             // another source, they should be able to encrypt first)
             handlers['key-make'] = async function ({ password }) {
-                if (!_prefs__WEBPACK_IMPORTED_MODULE_40__.getPrefs()) {
+                if (!_prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs()) {
                     throw new Error('user-set-key must be called with file loaded');
                 }
-                const salt = _encryption__WEBPACK_IMPORTED_MODULE_30__.randomBytes(32).toString('base64');
-                const id = (0, uuid__WEBPACK_IMPORTED_MODULE_53__["default"])();
-                const key = await _encryption__WEBPACK_IMPORTED_MODULE_30__.createKey({
+                const salt = _encryption__WEBPACK_IMPORTED_MODULE_31__.randomBytes(32).toString('base64');
+                const id = (0, uuid__WEBPACK_IMPORTED_MODULE_54__["default"])();
+                const key = await _encryption__WEBPACK_IMPORTED_MODULE_31__.createKey({
                     id,
                     password,
                     salt
                 });
                 // Load the key
-                await _encryption__WEBPACK_IMPORTED_MODULE_30__.loadKey(key);
+                await _encryption__WEBPACK_IMPORTED_MODULE_31__.loadKey(key);
                 // Make some test data to use if the key is valid or not
-                const testContent = await (0, _sync__WEBPACK_IMPORTED_MODULE_47__.makeTestMessage)(key.getId());
+                const testContent = await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.makeTestMessage)(key.getId());
                 // Changing your key necessitates a sync reset as well. This will
                 // clear all existing encrypted data from the server so you won't
                 // have a mix of data encrypted with different keys.
-                return await (0, _sync__WEBPACK_IMPORTED_MODULE_47__.resetSync)({
+                return await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.resetSync)({
                     key,
                     salt,
                     testContent: JSON.stringify({
@@ -46781,11 +47094,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             handlers['key-test'] = async function ({ fileId, password }) {
                 const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('user-token');
                 if (fileId == null) {
-                    fileId = _prefs__WEBPACK_IMPORTED_MODULE_40__.getPrefs().cloudFileId;
+                    fileId = _prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs().cloudFileId;
                 }
                 let res;
                 try {
-                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_38__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().SYNC_SERVER + '/user-get-key', {
+                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SYNC_SERVER + '/user-get-key', {
                         token: userToken,
                         fileId
                     });
@@ -46808,19 +47121,19 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 test = JSON.parse(test);
-                const key = await _encryption__WEBPACK_IMPORTED_MODULE_30__.createKey({
+                const key = await _encryption__WEBPACK_IMPORTED_MODULE_31__.createKey({
                     id,
                     password,
                     salt
                 });
-                _encryption__WEBPACK_IMPORTED_MODULE_30__.loadKey(key);
+                _encryption__WEBPACK_IMPORTED_MODULE_31__.loadKey(key);
                 try {
-                    await _encryption__WEBPACK_IMPORTED_MODULE_30__.decrypt(Buffer.from(test.value, 'base64'), test.meta);
+                    await _encryption__WEBPACK_IMPORTED_MODULE_31__.decrypt(Buffer.from(test.value, 'base64'), test.meta);
                 }
                 catch (e) {
                     console.log(e);
                     // Unload the key, it's invalid
-                    _encryption__WEBPACK_IMPORTED_MODULE_30__.unloadKey(key);
+                    _encryption__WEBPACK_IMPORTED_MODULE_31__.unloadKey(key);
                     return {
                         error: {
                             reason: 'decrypt-failure'
@@ -46834,8 +47147,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // Save the key id in prefs if the are loaded. If they aren't, we
                 // are testing a key to download a file and when the file is
                 // actually downloaded it will update the prefs with the latest key id
-                if (_prefs__WEBPACK_IMPORTED_MODULE_40__.getPrefs()) {
-                    await _prefs__WEBPACK_IMPORTED_MODULE_40__.savePrefs({
+                if (_prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs()) {
+                    await _prefs__WEBPACK_IMPORTED_MODULE_41__.savePrefs({
                         encryptKeyId: key.getId()
                     });
                 }
@@ -46845,13 +47158,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return Boolean(await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('did-bootstrap'));
             };
             handlers['subscribe-needs-bootstrap'] = async function ({ url } = {}) {
-                if (url && !(0, _server_config__WEBPACK_IMPORTED_MODULE_44__.isValidBaseURL)(url)) {
+                if (url && !(0, _server_config__WEBPACK_IMPORTED_MODULE_45__.isValidBaseURL)(url)) {
                     return {
                         error: 'get-server-failure'
                     };
                 }
                 try {
-                    if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)(url)) {
+                    if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)(url)) {
                         return {
                             bootstrapped: true,
                             hasServer: false
@@ -46865,7 +47178,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 let res;
                 try {
-                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_38__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)(url).SIGNUP_SERVER + '/needs-bootstrap');
+                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_39__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)(url).SIGNUP_SERVER + '/needs-bootstrap');
                 }
                 catch (err) {
                     return {
@@ -46887,32 +47200,49 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return {
                     bootstrapped: res.data.bootstrapped,
-                    loginMethod: res.data.loginMethod || 'password',
+                    availableLoginMethods: res.data.availableLoginMethods || [
+                        {
+                            method: 'password',
+                            active: true,
+                            displayName: 'Password'
+                        }
+                    ],
+                    multiuser: res.data.multiuser || false,
                     hasServer: true
                 };
             };
-            handlers['subscribe-bootstrap'] = async function ({ password }) {
+            handlers['subscribe-bootstrap'] = async function (loginConfig) {
+                try {
+                    await (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SIGNUP_SERVER + '/bootstrap', loginConfig);
+                }
+                catch (err) {
+                    return {
+                        error: err.reason || 'network-failure'
+                    };
+                }
+                return {};
+            };
+            handlers['subscribe-get-login-methods'] = async function () {
                 let res;
                 try {
-                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_38__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().SIGNUP_SERVER + '/bootstrap', {
-                        password
-                    });
+                    res = await fetch((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SIGNUP_SERVER + '/login-methods').then((res) => res.json());
                 }
                 catch (err) {
                     return {
                         error: err.reason || 'network-failure'
                     };
                 }
-                if (res.token) {
-                    await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('user-token', res.token);
-                    return {};
+                if (res.methods) {
+                    return {
+                        methods: res.methods
+                    };
                 }
                 return {
                     error: 'internal'
                 };
             };
             handlers['subscribe-get-user'] = async function () {
-                if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)()) {
+                if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)()) {
                     if (!await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('did-bootstrap')) {
                         return null;
                     }
@@ -46925,22 +47255,34 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return null;
                 }
                 try {
-                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_38__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().SIGNUP_SERVER + '/validate', {
+                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_39__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SIGNUP_SERVER + '/validate', {
                         headers: {
                             'X-ACTUAL-TOKEN': userToken
                         }
                     });
-                    const { status, reason } = JSON.parse(res);
+                    let tokenExpired = false;
+                    const { status, reason, data: { userName = null, permission = '', userId = null, displayName = null, loginMethod = null } = {} } = JSON.parse(res) || {};
                     if (status === 'error') {
                         if (reason === 'unauthorized') {
                             return null;
                         }
-                        return {
-                            offline: true
-                        };
+                        else if (reason === 'token-expired') {
+                            tokenExpired = true;
+                        }
+                        else {
+                            return {
+                                offline: true
+                            };
+                        }
                     }
                     return {
-                        offline: false
+                        offline: false,
+                        userName,
+                        permission,
+                        userId,
+                        displayName,
+                        loginMethod,
+                        tokenExpired
                     };
                 }
                 catch (e) {
@@ -46958,7 +47300,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    await (0, _post__WEBPACK_IMPORTED_MODULE_38__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().SIGNUP_SERVER + '/change-password', {
+                    await (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SIGNUP_SERVER + '/change-password', {
                         token: userToken,
                         password
                     });
@@ -46970,22 +47312,24 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return {};
             };
-            handlers['subscribe-sign-in'] = async function ({ password, loginMethod }) {
-                if (typeof loginMethod !== 'string' || loginMethod == null) {
-                    loginMethod = 'password';
+            handlers['subscribe-sign-in'] = async function (loginInfo) {
+                if (typeof loginInfo.loginMethod !== 'string' || loginInfo.loginMethod == null) {
+                    loginInfo.loginMethod = 'password';
                 }
                 let res;
                 try {
-                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_38__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().SIGNUP_SERVER + '/login', {
-                        loginMethod,
-                        password
-                    });
+                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SIGNUP_SERVER + '/login', loginInfo);
                 }
                 catch (err) {
                     return {
                         error: err.reason || 'network-failure'
                     };
                 }
+                if (res.redirect_url) {
+                    return {
+                        redirect_url: res.redirect_url
+                    };
+                }
                 if (!res.token) {
                     throw new Error('login: User token not set');
                 }
@@ -46993,7 +47337,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return {};
             };
             handlers['subscribe-sign-out'] = async function () {
-                _encryption__WEBPACK_IMPORTED_MODULE_30__.unloadAllKeys();
+                _encryption__WEBPACK_IMPORTED_MODULE_31__.unloadAllKeys();
                 await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.multiRemove([
                     'user-token',
                     'encrypt-keys',
@@ -47002,15 +47346,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 ]);
                 return 'ok';
             };
+            handlers['subscribe-set-token'] = async function ({ token }) {
+                await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('user-token', token);
+            };
             handlers['get-server-version'] = async function () {
-                if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)()) {
+                if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)()) {
                     return {
                         error: 'no-server'
                     };
                 }
                 let version;
                 try {
-                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_38__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().BASE_SERVER + '/info');
+                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_39__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().BASE_SERVER + '/info');
                     const info = JSON.parse(res);
                     version = info.build.version;
                 }
@@ -47024,7 +47371,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 };
             };
             handlers['get-server-url'] = async function () {
-                return (0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)() && (0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)().BASE_SERVER;
+                return (0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)() && (0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().BASE_SERVER;
             };
             handlers['set-server-url'] = async function ({ url, validate = true }) {
                 if (url == null) {
@@ -47034,7 +47381,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     url = url.replace(/\/+$/, '');
                     if (validate) {
                         // Validate the server is running
-                        const result = await (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.runHandler)(handlers['subscribe-needs-bootstrap'], {
+                        const result = await (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.runHandler)(handlers['subscribe-needs-bootstrap'], {
                             url
                         });
                         if ('error' in result) {
@@ -47046,11 +47393,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('server-url', url);
                 await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('did-bootstrap', true);
-                (0, _server_config__WEBPACK_IMPORTED_MODULE_44__.setServer)(url);
+                (0, _server_config__WEBPACK_IMPORTED_MODULE_45__.setServer)(url);
                 return {};
             };
             handlers['sync'] = async function () {
-                return (0, _sync__WEBPACK_IMPORTED_MODULE_47__.fullSync)();
+                return (0, _sync__WEBPACK_IMPORTED_MODULE_48__.fullSync)();
+            };
+            handlers['validate-budget-name'] = async function ({ name }) {
+                return (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_53__.validateBudgetName)(name);
+            };
+            handlers['unique-budget-name'] = async function ({ name }) {
+                return (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_53__.uniqueBudgetName)(name);
             };
             handlers['get-budgets'] = async function () {
                 const paths = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.listDir(_platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.getDocumentDir());
@@ -47081,6 +47434,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 ...prefs.groupId ? {
                                     groupId: prefs.groupId
                                 } : {},
+                                ...prefs.owner ? {
+                                    owner: prefs.owner
+                                } : {},
                                 name: prefs.budgetName || '(no name)'
                             };
                         }
@@ -47090,23 +47446,26 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return budgets;
             };
             handlers['get-remote-files'] = async function () {
-                return _cloud_storage__WEBPACK_IMPORTED_MODULE_26__.listRemoteFiles();
+                return _cloud_storage__WEBPACK_IMPORTED_MODULE_27__.listRemoteFiles();
+            };
+            handlers['get-user-file-info'] = async function (fileId) {
+                return _cloud_storage__WEBPACK_IMPORTED_MODULE_27__.getRemoteFile(fileId);
             };
-            handlers['reset-budget-cache'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.mutator)(async function () {
+            handlers['reset-budget-cache'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(async function () {
                 // Recomputing everything will update the cache
-                await _sheet__WEBPACK_IMPORTED_MODULE_45__.loadUserBudgets(_db__WEBPACK_IMPORTED_MODULE_28__);
-                _sheet__WEBPACK_IMPORTED_MODULE_45__.get().recomputeAll();
-                await _sheet__WEBPACK_IMPORTED_MODULE_45__.waitOnSpreadsheet();
+                await _sheet__WEBPACK_IMPORTED_MODULE_46__.loadUserBudgets(_db__WEBPACK_IMPORTED_MODULE_29__);
+                _sheet__WEBPACK_IMPORTED_MODULE_46__.get().recomputeAll();
+                await _sheet__WEBPACK_IMPORTED_MODULE_46__.waitOnSpreadsheet();
             });
             handlers['upload-budget'] = async function ({ id } = {}) {
                 if (id) {
-                    if (_prefs__WEBPACK_IMPORTED_MODULE_40__.getPrefs()) {
+                    if (_prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs()) {
                         throw new Error('upload-budget: id given but prefs already loaded');
                     }
-                    await _prefs__WEBPACK_IMPORTED_MODULE_40__.loadPrefs(id);
+                    await _prefs__WEBPACK_IMPORTED_MODULE_41__.loadPrefs(id);
                 }
                 try {
-                    await _cloud_storage__WEBPACK_IMPORTED_MODULE_26__.upload();
+                    await _cloud_storage__WEBPACK_IMPORTED_MODULE_27__.upload();
                 }
                 catch (e) {
                     console.log(e);
@@ -47124,7 +47483,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 finally {
                     if (id) {
-                        _prefs__WEBPACK_IMPORTED_MODULE_40__.unloadPrefs();
+                        _prefs__WEBPACK_IMPORTED_MODULE_41__.unloadPrefs();
                     }
                 }
                 return {};
@@ -47132,14 +47491,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             handlers['download-budget'] = async function ({ fileId }) {
                 let result;
                 try {
-                    result = await _cloud_storage__WEBPACK_IMPORTED_MODULE_26__.download(fileId);
+                    result = await _cloud_storage__WEBPACK_IMPORTED_MODULE_27__.download(fileId);
                 }
                 catch (e) {
                     if (e.type === 'FileDownloadError') {
                         if (e.reason === 'file-exists' && e.meta.id) {
-                            await _prefs__WEBPACK_IMPORTED_MODULE_40__.loadPrefs(e.meta.id);
-                            const name = _prefs__WEBPACK_IMPORTED_MODULE_40__.getPrefs().budgetName;
-                            _prefs__WEBPACK_IMPORTED_MODULE_40__.unloadPrefs();
+                            await _prefs__WEBPACK_IMPORTED_MODULE_41__.loadPrefs(e.meta.id);
+                            const name = _prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs().budgetName;
+                            _prefs__WEBPACK_IMPORTED_MODULE_41__.unloadPrefs();
                             e.meta = {
                                 ...e.meta,
                                 name
@@ -47172,12 +47531,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             };
             // open and sync, but don’t close
             handlers['sync-budget'] = async function () {
-                (0, _sync__WEBPACK_IMPORTED_MODULE_47__.setSyncingMode)('enabled');
-                const result = await (0, _sync__WEBPACK_IMPORTED_MODULE_47__.initialFullSync)();
+                (0, _sync__WEBPACK_IMPORTED_MODULE_48__.setSyncingMode)('enabled');
+                const result = await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.initialFullSync)();
                 return result;
             };
             handlers['load-budget'] = async function ({ id }) {
-                const currentPrefs = _prefs__WEBPACK_IMPORTED_MODULE_40__.getPrefs();
+                const currentPrefs = _prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs();
                 if (currentPrefs) {
                     if (currentPrefs.id === id) {
                         // If it's already loaded, do nothing
@@ -47207,11 +47566,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     message: 'Closing budget'
                 });
                 // The spreadsheet may be running, wait for it to complete
-                await _sheet__WEBPACK_IMPORTED_MODULE_45__.waitOnSpreadsheet();
-                _sheet__WEBPACK_IMPORTED_MODULE_45__.unloadSpreadsheet();
-                (0, _sync__WEBPACK_IMPORTED_MODULE_47__.clearFullSyncTimeout)();
-                await _main_app__WEBPACK_IMPORTED_MODULE_34__.app.stopServices();
-                await _db__WEBPACK_IMPORTED_MODULE_28__.closeDatabase();
+                await _sheet__WEBPACK_IMPORTED_MODULE_46__.waitOnSpreadsheet();
+                _sheet__WEBPACK_IMPORTED_MODULE_46__.unloadSpreadsheet();
+                (0, _sync__WEBPACK_IMPORTED_MODULE_48__.clearFullSyncTimeout)();
+                await _main_app__WEBPACK_IMPORTED_MODULE_35__.app.stopServices();
+                await _db__WEBPACK_IMPORTED_MODULE_29__.closeDatabase();
                 try {
                     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('lastBudget', '');
                 }
@@ -47220,23 +47579,98 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     // budget. We want to unload whatever has already been loaded but
                     // be resilient to anything failing
                 }
-                _prefs__WEBPACK_IMPORTED_MODULE_40__.unloadPrefs();
-                (0, _backups__WEBPACK_IMPORTED_MODULE_23__.stopBackupService)();
+                _prefs__WEBPACK_IMPORTED_MODULE_41__.unloadPrefs();
+                await (0, _backups__WEBPACK_IMPORTED_MODULE_24__.stopBackupService)();
                 return 'ok';
             };
             handlers['delete-budget'] = async function ({ id, cloudFileId }) {
                 // If it's a cloud file, you can delete it from the server by
                 // passing its cloud id
                 if (cloudFileId) {
-                    await _cloud_storage__WEBPACK_IMPORTED_MODULE_26__.removeFile(cloudFileId).catch(() => { });
+                    await _cloud_storage__WEBPACK_IMPORTED_MODULE_27__.removeFile(cloudFileId).catch(() => { });
                 }
                 // If a local file exists, you can delete it by passing its local id
                 if (id) {
-                    const budgetDir = _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.getBudgetDir(id);
-                    await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.removeDirRecursively(budgetDir);
+                    // opening and then closing the database is a hack to be able to delete
+                    // the budget file if it hasn't been opened yet.  This needs a better
+                    // way, but works for now.
+                    try {
+                        await _db__WEBPACK_IMPORTED_MODULE_29__.openDatabase(id);
+                        await _db__WEBPACK_IMPORTED_MODULE_29__.closeDatabase();
+                        const budgetDir = _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.getBudgetDir(id);
+                        await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.removeDirRecursively(budgetDir);
+                    }
+                    catch (e) {
+                        return 'fail';
+                    }
                 }
                 return 'ok';
             };
+            handlers['duplicate-budget'] = async function ({ id, newName, cloudSync, open }) {
+                if (!id)
+                    throw new Error('Unable to duplicate a budget that is not local.');
+                const { valid, message } = await (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_53__.validateBudgetName)(newName);
+                if (!valid)
+                    throw new Error(message);
+                const budgetDir = _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.getBudgetDir(id);
+                const newId = await (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_53__.idFromBudgetName)(newName);
+                // copy metadata from current budget
+                // replace id with new budget id and budgetName with new budget name
+                const metadataText = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.readFile(_platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.join(budgetDir, 'metadata.json'));
+                const metadata = JSON.parse(metadataText);
+                metadata.id = newId;
+                metadata.budgetName = newName;
+                [
+                    'cloudFileId',
+                    'groupId',
+                    'lastUploaded',
+                    'encryptKeyId',
+                    'lastSyncedTimestamp'
+                ].forEach((item) => {
+                    if (metadata[item])
+                        delete metadata[item];
+                });
+                try {
+                    const newBudgetDir = _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.getBudgetDir(newId);
+                    await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.mkdir(newBudgetDir);
+                    // write metadata for new budget
+                    await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.writeFile(_platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.join(newBudgetDir, 'metadata.json'), JSON.stringify(metadata));
+                    await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.copyFile(_platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.join(budgetDir, 'db.sqlite'), _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.join(newBudgetDir, 'db.sqlite'));
+                }
+                catch (error) {
+                    // Clean up any partially created files
+                    try {
+                        const newBudgetDir = _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.getBudgetDir(newId);
+                        if (await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.exists(newBudgetDir)) {
+                            await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.removeDirRecursively(newBudgetDir);
+                        }
+                    }
+                    catch { } // Ignore cleanup errors
+                    throw new Error(`Failed to duplicate budget: ${error.message}`);
+                }
+                // load in and validate
+                const { error } = await loadBudget(newId);
+                if (error) {
+                    console.log('Error duplicating budget: ' + error);
+                    return error;
+                }
+                if (cloudSync) {
+                    try {
+                        await _cloud_storage__WEBPACK_IMPORTED_MODULE_27__.upload();
+                    }
+                    catch (error) {
+                        console.warn('Failed to sync duplicated budget to cloud:', error);
+                        // Ignore any errors uploading. If they are offline they should
+                        // still be able to create files.
+                    }
+                }
+                handlers['close-budget']();
+                if (open === 'original')
+                    await loadBudget(id);
+                if (open === 'copy')
+                    await loadBudget(newId);
+                return newId;
+            };
             handlers['create-budget'] = async function ({ budgetName, avoidUpload, testMode, testBudgetId } = {}) {
                 let id;
                 if (testMode) {
@@ -47249,19 +47683,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 else {
                     // Generate budget name if not given
                     if (!budgetName) {
-                        // Unfortunately we need to load all of the existing files first
-                        // so we can detect conflicting names.
-                        const files = await handlers['get-budgets']();
-                        budgetName = await (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_52__.uniqueFileName)(files);
+                        budgetName = await (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_53__.uniqueBudgetName)();
                     }
-                    id = await (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_52__.idFromFileName)(budgetName);
+                    id = await (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_53__.idFromBudgetName)(budgetName);
                 }
                 const budgetDir = _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.getBudgetDir(id);
                 await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.mkdir(budgetDir);
                 // Create the initial database
                 await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.copyFile(_platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.bundledDatabasePath, _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.join(budgetDir, 'db.sqlite'));
                 // Create the initial prefs file
-                await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.writeFile(_platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.join(budgetDir, 'metadata.json'), JSON.stringify(_prefs__WEBPACK_IMPORTED_MODULE_40__.getDefaultPrefs(id, budgetName)));
+                await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.writeFile(_platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.join(budgetDir, 'metadata.json'), JSON.stringify(_prefs__WEBPACK_IMPORTED_MODULE_41__.getDefaultPrefs(id, budgetName)));
                 // Load it in
                 const { error } = await loadBudget(id);
                 if (error) {
@@ -47272,7 +47703,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 if (!avoidUpload && !testMode) {
                     try {
-                        await _cloud_storage__WEBPACK_IMPORTED_MODULE_26__.upload();
+                        await _cloud_storage__WEBPACK_IMPORTED_MODULE_27__.upload();
                     }
                     catch (e) {
                         // Ignore any errors uploading. If they are offline they should
@@ -47290,7 +47721,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         throw new Error(`File not found at the provided path: ${filepath}`);
                     }
                     const buffer = Buffer.from(await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.readFile(filepath, 'binary'));
-                    const results = await (0, _importers__WEBPACK_IMPORTED_MODULE_33__.handleBudgetImport)(type, filepath, buffer);
+                    const results = await (0, _importers__WEBPACK_IMPORTED_MODULE_34__.handleBudgetImport)(type, filepath, buffer);
                     return results || {};
                 }
                 catch (err) {
@@ -47304,7 +47735,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             handlers['export-budget'] = async function () {
                 try {
                     return {
-                        data: await _cloud_storage__WEBPACK_IMPORTED_MODULE_26__.exportBuffer()
+                        data: await _cloud_storage__WEBPACK_IMPORTED_MODULE_27__.exportBuffer()
                     };
                 }
                 catch (err) {
@@ -47315,6 +47746,116 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
             };
+            handlers['enable-openid'] = async function (loginConfig) {
+                try {
+                    const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('user-token');
+                    if (!userToken) {
+                        return {
+                            error: 'unauthorized'
+                        };
+                    }
+                    await (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().BASE_SERVER + '/openid/enable', loginConfig, {
+                        'X-ACTUAL-TOKEN': userToken
+                    });
+                }
+                catch (err) {
+                    return {
+                        error: err.reason || 'network-failure'
+                    };
+                }
+                return {};
+            };
+            handlers['enable-password'] = async function (loginConfig) {
+                try {
+                    const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('user-token');
+                    if (!userToken) {
+                        return {
+                            error: 'unauthorized'
+                        };
+                    }
+                    await (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().BASE_SERVER + '/openid/disable', loginConfig, {
+                        'X-ACTUAL-TOKEN': userToken
+                    });
+                }
+                catch (err) {
+                    return {
+                        error: err.reason || 'network-failure'
+                    };
+                }
+                return {};
+            };
+            handlers['get-openid-config'] = async function () {
+                try {
+                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_39__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().BASE_SERVER + '/openid/config');
+                    if (res) {
+                        const config = JSON.parse(res);
+                        return {
+                            openId: config
+                        };
+                    }
+                    return null;
+                }
+                catch (err) {
+                    return {
+                        error: 'config-fetch-failed'
+                    };
+                }
+            };
+            handlers['enable-openid'] = async function (loginConfig) {
+                try {
+                    const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('user-token');
+                    if (!userToken) {
+                        return {
+                            error: 'unauthorized'
+                        };
+                    }
+                    await (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().BASE_SERVER + '/openid/enable', loginConfig, {
+                        'X-ACTUAL-TOKEN': userToken
+                    });
+                }
+                catch (err) {
+                    return {
+                        error: err.reason || 'network-failure'
+                    };
+                }
+                return {};
+            };
+            handlers['enable-password'] = async function (loginConfig) {
+                try {
+                    const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('user-token');
+                    if (!userToken) {
+                        return {
+                            error: 'unauthorized'
+                        };
+                    }
+                    await (0, _post__WEBPACK_IMPORTED_MODULE_39__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().BASE_SERVER + '/openid/disable', loginConfig, {
+                        'X-ACTUAL-TOKEN': userToken
+                    });
+                }
+                catch (err) {
+                    return {
+                        error: err.reason || 'network-failure'
+                    };
+                }
+                return {};
+            };
+            handlers['get-openid-config'] = async function () {
+                try {
+                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_39__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().BASE_SERVER + '/openid/config');
+                    if (res) {
+                        const config = JSON.parse(res);
+                        return {
+                            openId: config
+                        };
+                    }
+                    return null;
+                }
+                catch (err) {
+                    return {
+                        error: 'config-fetch-failed'
+                    };
+                }
+            };
             async function loadBudget(id) {
                 let dir;
                 try {
@@ -47336,8 +47877,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    await _prefs__WEBPACK_IMPORTED_MODULE_40__.loadPrefs(id);
-                    await _db__WEBPACK_IMPORTED_MODULE_28__.openDatabase(id);
+                    await _prefs__WEBPACK_IMPORTED_MODULE_41__.loadPrefs(id);
+                    await _db__WEBPACK_IMPORTED_MODULE_29__.openDatabase(id);
                 }
                 catch (e) {
                     (0, _platform_exceptions__WEBPACK_IMPORTED_MODULE_4__.captureBreadcrumb)({
@@ -47351,14 +47892,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 // Older versions didn't tag the file with the current user, so do
                 // so now
-                if (!_prefs__WEBPACK_IMPORTED_MODULE_40__.getPrefs().userId) {
+                if (!_prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs().userId) {
                     const userId = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('user-token');
-                    _prefs__WEBPACK_IMPORTED_MODULE_40__.savePrefs({
+                    _prefs__WEBPACK_IMPORTED_MODULE_41__.savePrefs({
                         userId
                     });
                 }
                 try {
-                    await (0, _update__WEBPACK_IMPORTED_MODULE_51__.updateVersion)();
+                    await (0, _update__WEBPACK_IMPORTED_MODULE_52__.updateVersion)();
                 }
                 catch (e) {
                     console.warn('Error updating', e);
@@ -47384,8 +47925,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     await handlers['close-budget']();
                     return result;
                 }
-                await _db__WEBPACK_IMPORTED_MODULE_28__.loadClock();
-                if (_prefs__WEBPACK_IMPORTED_MODULE_40__.getPrefs().resetClock) {
+                await _db__WEBPACK_IMPORTED_MODULE_29__.loadClock();
+                if (_prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs().resetClock) {
                     // If we need to generate a fresh clock, we need to generate a new
                     // client id. This happens when the database is transferred to a
                     // new device.
@@ -47393,18 +47934,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     // TODO: The client id should be stored elsewhere. It shouldn't
                     // work this way, but it's fine for now.
                     _actual_app_crdt__WEBPACK_IMPORTED_MODULE_2__.getClock().timestamp.setNode(_actual_app_crdt__WEBPACK_IMPORTED_MODULE_2__.makeClientId());
-                    await _db__WEBPACK_IMPORTED_MODULE_28__.runQuery('INSERT OR REPLACE INTO messages_clock (id, clock) VALUES (1, ?)', [
+                    await _db__WEBPACK_IMPORTED_MODULE_29__.runQuery('INSERT OR REPLACE INTO messages_clock (id, clock) VALUES (1, ?)', [
                         _actual_app_crdt__WEBPACK_IMPORTED_MODULE_2__.serializeClock(_actual_app_crdt__WEBPACK_IMPORTED_MODULE_2__.getClock())
                     ]);
-                    await _prefs__WEBPACK_IMPORTED_MODULE_40__.savePrefs({
+                    await _prefs__WEBPACK_IMPORTED_MODULE_41__.savePrefs({
                         resetClock: false
                     });
                 }
-                if (!_platform__WEBPACK_IMPORTED_MODULE_37__.isWeb && !_platform__WEBPACK_IMPORTED_MODULE_37__.isMobile && "development" !== 'test') {
-                    (0, _backups__WEBPACK_IMPORTED_MODULE_23__.startBackupService)(id);
+                if (!_platform__WEBPACK_IMPORTED_MODULE_38__.isWeb && !_platform__WEBPACK_IMPORTED_MODULE_38__.isMobile && "development" !== 'test') {
+                    await (0, _backups__WEBPACK_IMPORTED_MODULE_24__.startBackupService)(id);
                 }
                 try {
-                    await _sheet__WEBPACK_IMPORTED_MODULE_45__.loadSpreadsheet(_db__WEBPACK_IMPORTED_MODULE_28__, onSheetChange);
+                    await _sheet__WEBPACK_IMPORTED_MODULE_46__.loadSpreadsheet(_db__WEBPACK_IMPORTED_MODULE_29__, onSheetChange);
                 }
                 catch (e) {
                     (0, _platform_exceptions__WEBPACK_IMPORTED_MODULE_4__.captureException)(e);
@@ -47414,56 +47955,56 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 // This is a bit leaky, but we need to set the initial budget type
-                const { value: budgetType = 'rollover' } = await _db__WEBPACK_IMPORTED_MODULE_28__.first('SELECT value from preferences WHERE id = ?', [
+                const { value: budgetType = 'rollover' } = await _db__WEBPACK_IMPORTED_MODULE_29__.first('SELECT value from preferences WHERE id = ?', [
                     'budgetType'
                 ]) ?? {};
-                _sheet__WEBPACK_IMPORTED_MODULE_45__.get().meta().budgetType = budgetType;
-                await _budget_base__WEBPACK_IMPORTED_MODULE_25__.createAllBudgets();
+                _sheet__WEBPACK_IMPORTED_MODULE_46__.get().meta().budgetType = budgetType;
+                await _budget_base__WEBPACK_IMPORTED_MODULE_26__.createAllBudgets();
                 // Load all the in-memory state
-                await _db_mappings__WEBPACK_IMPORTED_MODULE_29__.loadMappings();
+                await _db_mappings__WEBPACK_IMPORTED_MODULE_30__.loadMappings();
                 await _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_19__.loadRules();
-                await _sync_migrate__WEBPACK_IMPORTED_MODULE_48__.listen();
-                await _main_app__WEBPACK_IMPORTED_MODULE_34__.app.startServices();
-                (0, _undo__WEBPACK_IMPORTED_MODULE_50__.clearUndo)();
+                await _sync_migrate__WEBPACK_IMPORTED_MODULE_49__.listen();
+                await _main_app__WEBPACK_IMPORTED_MODULE_35__.app.startServices();
+                (0, _undo__WEBPACK_IMPORTED_MODULE_51__.clearUndo)();
                 // Ensure that syncing is enabled
                 if (true) {
                     if (id === DEMO_BUDGET_ID) {
-                        (0, _sync__WEBPACK_IMPORTED_MODULE_47__.setSyncingMode)('disabled');
+                        (0, _sync__WEBPACK_IMPORTED_MODULE_48__.setSyncingMode)('disabled');
                     }
                     else {
-                        if ((0, _server_config__WEBPACK_IMPORTED_MODULE_44__.getServer)()) {
-                            (0, _sync__WEBPACK_IMPORTED_MODULE_47__.setSyncingMode)('enabled');
+                        if ((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)()) {
+                            (0, _sync__WEBPACK_IMPORTED_MODULE_48__.setSyncingMode)('enabled');
                         }
                         else {
-                            (0, _sync__WEBPACK_IMPORTED_MODULE_47__.setSyncingMode)('disabled');
+                            (0, _sync__WEBPACK_IMPORTED_MODULE_48__.setSyncingMode)('disabled');
                         }
                         await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('lastBudget', id);
                         // Only upload periodically on desktop
-                        if (!_platform__WEBPACK_IMPORTED_MODULE_37__.isMobile) {
-                            await _cloud_storage__WEBPACK_IMPORTED_MODULE_26__.possiblyUpload();
+                        if (!_platform__WEBPACK_IMPORTED_MODULE_38__.isMobile) {
+                            await _cloud_storage__WEBPACK_IMPORTED_MODULE_27__.possiblyUpload();
                         }
                     }
                 }
-                _main_app__WEBPACK_IMPORTED_MODULE_34__.app.events.emit('load-budget', {
+                _main_app__WEBPACK_IMPORTED_MODULE_35__.app.events.emit('load-budget', {
                     id
                 });
                 return {};
             }
             handlers['upload-file-web'] = async function ({ filename, contents }) {
-                if (!_platform__WEBPACK_IMPORTED_MODULE_37__.isWeb) {
+                if (!_platform__WEBPACK_IMPORTED_MODULE_38__.isWeb) {
                     return null;
                 }
                 await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.writeFile('/uploads/' + filename, contents);
                 return {};
             };
             handlers['backups-get'] = async function ({ id }) {
-                return (0, _backups__WEBPACK_IMPORTED_MODULE_23__.getAvailableBackups)(id);
+                return (0, _backups__WEBPACK_IMPORTED_MODULE_24__.getAvailableBackups)(id);
             };
             handlers['backup-load'] = async function ({ id, backupId }) {
-                await (0, _backups__WEBPACK_IMPORTED_MODULE_23__.loadBackup)(id, backupId);
+                await (0, _backups__WEBPACK_IMPORTED_MODULE_24__.loadBackup)(id, backupId);
             };
             handlers['backup-make'] = async function ({ id }) {
-                await (0, _backups__WEBPACK_IMPORTED_MODULE_23__.makeBackup)(id);
+                await (0, _backups__WEBPACK_IMPORTED_MODULE_24__.makeBackup)(id);
             };
             handlers['get-last-opened-backup'] = async function () {
                 const id = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('lastBudget');
@@ -47478,18 +48019,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return null;
             };
             handlers['app-focused'] = async function () {
-                if (_prefs__WEBPACK_IMPORTED_MODULE_40__.getPrefs() && _prefs__WEBPACK_IMPORTED_MODULE_40__.getPrefs().id) {
+                if (_prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs() && _prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs().id) {
                     // First we sync
-                    (0, _sync__WEBPACK_IMPORTED_MODULE_47__.fullSync)();
+                    (0, _sync__WEBPACK_IMPORTED_MODULE_48__.fullSync)();
                 }
             };
-            handlers = (0, _api__WEBPACK_IMPORTED_MODULE_21__.installAPI)(handlers);
-            _actual_app_api_injected__WEBPACK_IMPORTED_MODULE_1__.override((name, args) => (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_34__.app.handlers[name], args));
+            handlers = (0, _api__WEBPACK_IMPORTED_MODULE_22__.installAPI)(handlers);
+            _actual_app_api_injected__WEBPACK_IMPORTED_MODULE_1__.override((name, args) => (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_35__.app.handlers[name], args));
             // A hack for now until we clean up everything
-            _main_app__WEBPACK_IMPORTED_MODULE_34__.app.handlers = handlers;
-            _main_app__WEBPACK_IMPORTED_MODULE_34__.app.combine(_schedules_app__WEBPACK_IMPORTED_MODULE_43__.app, _budget_app__WEBPACK_IMPORTED_MODULE_24__.app, _dashboard_app__WEBPACK_IMPORTED_MODULE_27__.app, _notes_app__WEBPACK_IMPORTED_MODULE_36__.app, _preferences_app__WEBPACK_IMPORTED_MODULE_39__.app, _tools_app__WEBPACK_IMPORTED_MODULE_49__.app, _filters_app__WEBPACK_IMPORTED_MODULE_32__.app, _reports_app__WEBPACK_IMPORTED_MODULE_41__.app, _rules_app__WEBPACK_IMPORTED_MODULE_42__.app);
+            _main_app__WEBPACK_IMPORTED_MODULE_35__.app.handlers = handlers;
+            _main_app__WEBPACK_IMPORTED_MODULE_35__.app.combine(_schedules_app__WEBPACK_IMPORTED_MODULE_44__.app, _budget_app__WEBPACK_IMPORTED_MODULE_25__.app, _dashboard_app__WEBPACK_IMPORTED_MODULE_28__.app, _notes_app__WEBPACK_IMPORTED_MODULE_37__.app, _preferences_app__WEBPACK_IMPORTED_MODULE_40__.app, _tools_app__WEBPACK_IMPORTED_MODULE_50__.app, _filters_app__WEBPACK_IMPORTED_MODULE_33__.app, _reports_app__WEBPACK_IMPORTED_MODULE_42__.app, _rules_app__WEBPACK_IMPORTED_MODULE_43__.app, _admin_app__WEBPACK_IMPORTED_MODULE_21__.app);
             function getDefaultDocumentDir() {
-                if (_platform__WEBPACK_IMPORTED_MODULE_37__.isMobile) {
+                if (_platform__WEBPACK_IMPORTED_MODULE_38__.isMobile) {
                     // On mobile, unfortunately we need to be backwards compatible
                     // with the old folder structure which does not store files inside
                     // of an `Actual` directory. In the future, if we really care, we
@@ -47536,7 +48077,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         const keys = JSON.parse(keysStr);
                         // Load all the keys
                         await Promise.all(Object.keys(keys).map((fileId) => {
-                            return _encryption__WEBPACK_IMPORTED_MODULE_30__.loadKey(keys[fileId]);
+                            return _encryption__WEBPACK_IMPORTED_MODULE_31__.loadKey(keys[fileId]);
                         }));
                     }
                     catch (e) {
@@ -47548,15 +48089,15 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (!url) {
                     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.removeItem('user-token');
                 }
-                (0, _server_config__WEBPACK_IMPORTED_MODULE_44__.setServer)(url);
-                _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.init(socketName, _main_app__WEBPACK_IMPORTED_MODULE_34__.app.handlers);
+                (0, _server_config__WEBPACK_IMPORTED_MODULE_45__.setServer)(url);
+                _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.init(socketName, _main_app__WEBPACK_IMPORTED_MODULE_35__.app.handlers);
                 // Allow running DB queries locally
-                global.$query = _aql__WEBPACK_IMPORTED_MODULE_22__.runQuery;
+                global.$query = _aql__WEBPACK_IMPORTED_MODULE_23__.runQuery;
                 global.$q = _shared_query__WEBPACK_IMPORTED_MODULE_12__.q;
                 if (isDev) {
-                    global.$send = (name, args) => (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_34__.app.handlers[name], args);
-                    global.$db = _db__WEBPACK_IMPORTED_MODULE_28__;
-                    global.$setSyncingMode = _sync__WEBPACK_IMPORTED_MODULE_47__.setSyncingMode;
+                    global.$send = (name, args) => (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_35__.app.handlers[name], args);
+                    global.$db = _db__WEBPACK_IMPORTED_MODULE_29__;
+                    global.$setSyncingMode = _sync__WEBPACK_IMPORTED_MODULE_48__.setSyncingMode;
                 }
             }
             // eslint-disable-next-line import/no-unused-modules
@@ -47580,9 +48121,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 ]);
                 _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__._setDocumentDir(dataDir || process.cwd());
                 if (serverURL) {
-                    (0, _server_config__WEBPACK_IMPORTED_MODULE_44__.setServer)(serverURL);
+                    (0, _server_config__WEBPACK_IMPORTED_MODULE_45__.setServer)(serverURL);
                     if (config.password) {
-                        await (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.runHandler)(handlers['subscribe-sign-in'], {
+                        await (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.runHandler)(handlers['subscribe-sign-in'], {
                             password: config.password
                         });
                     }
@@ -47590,9 +48131,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 else {
                     // This turns off all server URLs. In this mode we don't want any
                     // access to the server, we are doing things locally
-                    (0, _server_config__WEBPACK_IMPORTED_MODULE_44__.setServer)(null);
-                    _main_app__WEBPACK_IMPORTED_MODULE_34__.app.events.on('load-budget', () => {
-                        (0, _sync__WEBPACK_IMPORTED_MODULE_47__.setSyncingMode)('offline');
+                    (0, _server_config__WEBPACK_IMPORTED_MODULE_45__.setServer)(null);
+                    _main_app__WEBPACK_IMPORTED_MODULE_35__.app.events.on('load-budget', () => {
+                        (0, _sync__WEBPACK_IMPORTED_MODULE_48__.setSyncingMode)('offline');
                     });
                 }
                 return lib;
@@ -47603,12 +48144,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 getDataDir: _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.getDataDir,
                 sendMessage: (msg, args) => _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.send(msg, args),
                 send: async (name, args) => {
-                    const res = await (0, _mutators__WEBPACK_IMPORTED_MODULE_35__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_34__.app.handlers[name], args);
+                    const res = await (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_35__.app.handlers[name], args);
                     return res;
                 },
-                on: (name, func) => _main_app__WEBPACK_IMPORTED_MODULE_34__.app.events.on(name, func),
+                on: (name, func) => _main_app__WEBPACK_IMPORTED_MODULE_35__.app.events.on(name, func),
                 q: _shared_query__WEBPACK_IMPORTED_MODULE_12__.q,
-                db: _db__WEBPACK_IMPORTED_MODULE_28__
+                db: _db__WEBPACK_IMPORTED_MODULE_29__
             };
             /***/ 
         }),
@@ -48047,7 +48588,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+                /* harmony export */ del: () => ( /* binding */del),
                 /* harmony export */ get: () => ( /* binding */get),
+                /* harmony export */ patch: () => ( /* binding */patch),
                 /* harmony export */ post: () => ( /* binding */post),
                 /* harmony export */ postBinary: () => ( /* binding */postBinary)
                 /* harmony export */ 
@@ -48079,7 +48622,45 @@ 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 = {}, timeout = null) {
+            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) {
+                    throw new _errors__WEBPACK_IMPORTED_MODULE_1__.PostError('network-failure');
+                }
+                throwIfNot200(res, text);
+                try {
+                    res = JSON.parse(text);
+                }
+                catch (err) {
+                    // Something seriously went wrong. TODO handle errors
+                    throw new _errors__WEBPACK_IMPORTED_MODULE_1__.PostError('parse-json', {
+                        meta: text
+                    });
+                }
+                if (res.status !== 'ok') {
+                    console.log('API call failed: ' + url + '\nData: ' + JSON.stringify(data, null, 2) + '\nResponse: ' + JSON.stringify(res, null, 2));
+                    throw new _errors__WEBPACK_IMPORTED_MODULE_1__.PostError(res.description || res.reason || 'unknown');
+                }
+                return res.data;
+            }
+            async function del(url, data, headers = {}, timeout = null) {
                 let text;
                 let res;
                 try {
@@ -48087,7 +48668,45 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     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',
+                        method: 'DELETE',
+                        body: JSON.stringify(data),
+                        signal,
+                        headers: {
+                            ...headers,
+                            'Content-Type': 'application/json'
+                        }
+                    });
+                    clearTimeout(timeoutId);
+                    text = await res.text();
+                }
+                catch (err) {
+                    throw new _errors__WEBPACK_IMPORTED_MODULE_1__.PostError('network-failure');
+                }
+                throwIfNot200(res, text);
+                try {
+                    res = JSON.parse(text);
+                }
+                catch (err) {
+                    // Something seriously went wrong. TODO handle errors
+                    throw new _errors__WEBPACK_IMPORTED_MODULE_1__.PostError('parse-json', {
+                        meta: text
+                    });
+                }
+                if (res.status !== 'ok') {
+                    console.log('API call failed: ' + url + '\nData: ' + JSON.stringify(data, null, 2) + '\nResponse: ' + JSON.stringify(res, null, 2));
+                    throw new _errors__WEBPACK_IMPORTED_MODULE_1__.PostError(res.description || res.reason || 'unknown');
+                }
+                return res.data;
+            }
+            async function patch(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: 'PATCH',
                         body: JSON.stringify(data),
                         signal,
                         headers: {
@@ -51336,65 +51955,77 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ app: () => ( /* binding */app)
                 /* harmony export */ 
             });
-            /* harmony import */ var _accounts_transactions__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../accounts/transactions */ "./packages/loot-core/src/server/accounts/transactions.ts");
-            /* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../app */ "./packages/loot-core/src/server/app.ts");
-            /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
-            /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../mutators */ "./packages/loot-core/src/server/mutators.ts");
+            /* harmony import */ var _shared_query__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../shared/query */ "./packages/loot-core/src/shared/query.ts");
+            /* harmony import */ var _accounts_transactions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../accounts/transactions */ "./packages/loot-core/src/server/accounts/transactions.ts");
+            /* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../app */ "./packages/loot-core/src/server/app.ts");
+            /* harmony import */ var _aql__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../aql */ "./packages/loot-core/src/server/aql/index.ts");
+            /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
+            /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../mutators */ "./packages/loot-core/src/server/mutators.ts");
             // @ts-strict-ignore
-            const app = (0, _app__WEBPACK_IMPORTED_MODULE_1__.createApp)();
+            const app = (0, _app__WEBPACK_IMPORTED_MODULE_2__.createApp)();
             app.method('tools/fix-split-transactions', async () => {
                 // 1. Check for child transactions that have a blank payee, and set
                 //    the payee to whatever the parent has
-                const blankPayeeRows = await _db__WEBPACK_IMPORTED_MODULE_2__.all(`
+                const blankPayeeRows = await _db__WEBPACK_IMPORTED_MODULE_4__.all(`
     SELECT t.*, p.payee AS parentPayee FROM v_transactions_internal t
     LEFT JOIN v_transactions_internal p ON t.parent_id = p.id
     WHERE t.is_child = 1 AND t.payee IS NULL AND p.payee IS NOT NULL
   `);
-                await (0, _mutators__WEBPACK_IMPORTED_MODULE_3__.runMutator)(async () => {
+                await (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(async () => {
                     const updated = blankPayeeRows.map((row) => ({
                         id: row.id,
                         payee: row.parentPayee
                     }));
-                    await (0, _accounts_transactions__WEBPACK_IMPORTED_MODULE_0__.batchUpdateTransactions)({
+                    await (0, _accounts_transactions__WEBPACK_IMPORTED_MODULE_1__.batchUpdateTransactions)({
                         updated
                     });
                 });
                 // 2. Make sure the "cleared" flag is synced up with the parent
                 // transactions
-                const clearedRows = await _db__WEBPACK_IMPORTED_MODULE_2__.all(`
+                const clearedRows = await _db__WEBPACK_IMPORTED_MODULE_4__.all(`
     SELECT t.id, p.cleared FROM v_transactions_internal t
     LEFT JOIN v_transactions_internal p ON t.parent_id = p.id
     WHERE t.is_child = 1 AND t.cleared != p.cleared
   `);
-                await (0, _mutators__WEBPACK_IMPORTED_MODULE_3__.runMutator)(async () => {
+                await (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(async () => {
                     const updated = clearedRows.map((row) => ({
                         id: row.id,
                         cleared: row.cleared === 1
                     }));
-                    await (0, _accounts_transactions__WEBPACK_IMPORTED_MODULE_0__.batchUpdateTransactions)({
+                    await (0, _accounts_transactions__WEBPACK_IMPORTED_MODULE_1__.batchUpdateTransactions)({
                         updated
                     });
                 });
                 // 3. Mark the `tombstone` field as true on any child transactions
                 //    that have a dead parent
-                const deletedRows = await _db__WEBPACK_IMPORTED_MODULE_2__.all(`
+                const deletedRows = await _db__WEBPACK_IMPORTED_MODULE_4__.all(`
     SELECT t.* FROM v_transactions_internal t
     LEFT JOIN v_transactions_internal p ON t.parent_id = p.id
     WHERE t.is_child = 1 AND t.tombstone = 0 AND (p.tombstone = 1 OR p.id IS NULL)
   `);
-                await (0, _mutators__WEBPACK_IMPORTED_MODULE_3__.runMutator)(async () => {
+                await (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(async () => {
                     const updated = deletedRows.map((row) => ({
                         id: row.id,
                         tombstone: 1
                     }));
-                    await (0, _accounts_transactions__WEBPACK_IMPORTED_MODULE_0__.batchUpdateTransactions)({
+                    await (0, _accounts_transactions__WEBPACK_IMPORTED_MODULE_1__.batchUpdateTransactions)({
                         updated
                     });
                 });
+                const splitTransactions = (await (0, _aql__WEBPACK_IMPORTED_MODULE_3__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_0__.q)('transactions').options({
+                    splits: 'grouped'
+                }).filter({
+                    is_parent: true
+                }).select('*'))).data;
+                const mismatchedSplits = splitTransactions.filter((t) => {
+                    const subValue = t.subtransactions.reduce((acc, st) => acc + st.amount, 0);
+                    return subValue !== t.amount;
+                });
                 return {
                     numBlankPayees: blankPayeeRows.length,
                     numCleared: clearedRows.length,
-                    numDeleted: deletedRows.length
+                    numDeleted: deletedRows.length,
+                    mismatchedSplits
                 };
             });
             /***/ 
@@ -51693,27 +52324,47 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ idFromFileName: () => ( /* binding */idFromFileName),
-                /* harmony export */ uniqueFileName: () => ( /* binding */uniqueFileName)
+                /* harmony export */ idFromBudgetName: () => ( /* binding */idFromBudgetName),
+                /* harmony export */ uniqueBudgetName: () => ( /* binding */uniqueBudgetName),
+                /* harmony export */ validateBudgetName: () => ( /* binding */validateBudgetName)
                 /* harmony export */ 
             });
-            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
+            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _platform_server_fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../platform/server/fs */ "./packages/loot-core/src/platform/server/fs/index.electron.ts");
-            // @ts-strict-ignore
-            async function uniqueFileName(existingFiles) {
-                const initialName = 'My Finances';
+            /* harmony import */ var _main__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../main */ "./packages/loot-core/src/server/main.ts");
+            async function uniqueBudgetName(initialName = 'My Finances') {
+                const budgets = await _main__WEBPACK_IMPORTED_MODULE_1__.handlers['get-budgets']();
                 let idx = 1;
                 // If there is a conflict, keep appending an index until there is no
                 // conflict and we have a unique name
                 let newName = initialName;
-                while (existingFiles.find((file) => file.name === newName)) {
+                while (budgets.find((file) => file.name === newName)) {
                     newName = `${initialName} ${idx}`;
                     idx++;
                 }
                 return newName;
             }
-            async function idFromFileName(name) {
-                let id = name.replace(/( |[^A-Za-z0-9])/g, '-') + '-' + (0, uuid__WEBPACK_IMPORTED_MODULE_1__["default"])().slice(0, 7);
+            async function validateBudgetName(name) {
+                const trimmedName = name.trim();
+                const uniqueName = await uniqueBudgetName(trimmedName);
+                let message = null;
+                if (trimmedName === '')
+                    message = 'Budget name cannot be blank';
+                if (trimmedName.length > 100) {
+                    message = 'Budget name is too long (max length 100)';
+                }
+                if (uniqueName !== trimmedName) {
+                    message = `“${name}” already exists, try “${uniqueName}” instead`;
+                }
+                return message ? {
+                    valid: false,
+                    message
+                } : {
+                    valid: true
+                };
+            }
+            async function idFromBudgetName(name) {
+                let id = name.replace(/( |[^A-Za-z0-9])/g, '-') + '-' + (0, uuid__WEBPACK_IMPORTED_MODULE_2__["default"])().slice(0, 7);
                 // Make sure the id is unique. There's a chance one could already
                 // exist (although very unlikely now that we append unique
                 // characters onto the id)
@@ -51949,9 +52600,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ getBankSyncError: () => ( /* binding */getBankSyncError),
                 /* harmony export */ getCreateKeyError: () => ( /* binding */getCreateKeyError),
                 /* harmony export */ getDownloadError: () => ( /* binding */getDownloadError),
+                /* harmony export */ getOpenIdErrors: () => ( /* binding */getOpenIdErrors),
+                /* harmony export */ getSecretsError: () => ( /* binding */getSecretsError),
                 /* harmony export */ getSyncError: () => ( /* binding */getSyncError),
                 /* harmony export */ getTestKeyError: () => ( /* binding */getTestKeyError),
-                /* harmony export */ getUploadError: () => ( /* binding */getUploadError)
+                /* harmony export */ getUploadError: () => ( /* binding */getUploadError),
+                /* harmony export */ getUserAccessErrors: () => ( /* binding */getUserAccessErrors)
                 /* harmony export */ 
             });
             /* harmony import */ var i18next__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! i18next */ "./node_modules/i18next/dist/esm/i18next.js");
@@ -52045,6 +52699,50 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     this.cause = cause;
                 }
             }
+            function getUserAccessErrors(reason) {
+                switch (reason) {
+                    case 'unauthorized':
+                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('You are not logged in.');
+                    case 'token-expired':
+                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('Login expired, please login again.');
+                    case 'user-cant-be-empty':
+                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('Please select a user.');
+                    case 'invalid-file-id':
+                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('This file is invalid.');
+                    case 'file-denied':
+                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('You don`t have permissions over this file.');
+                    case 'user-already-have-access':
+                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('User already has access.');
+                    default:
+                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('An internal error occurred, sorry! Visit https://actualbudget.org/contact/ for support. (ref: {{reason}})', {
+                            reason
+                        });
+                }
+            }
+            function getSecretsError(error, reason) {
+                switch (reason) {
+                    case 'unauthorized':
+                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('You are not logged in.');
+                    case 'not-admin':
+                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('You have to be admin to set secrets');
+                    default:
+                        return error;
+                }
+            }
+            function getOpenIdErrors(reason) {
+                switch (reason) {
+                    case 'unauthorized':
+                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('You are not logged in.');
+                    case 'configuration-error':
+                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('This configuration is not valid. Please check it again.');
+                    case 'unable-to-change-file-config-enabled':
+                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('Unable to enable OpenID. Please update the config.json file in this case.');
+                    default:
+                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('An internal error occurred, sorry! Visit https://actualbudget.org/contact/ for support. (ref: {{reason}})', {
+                            reason
+                        });
+                }
+            }
             /***/ 
         }),
         /***/ "./packages/loot-core/src/shared/months.ts": 
@@ -52537,19 +53235,22 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             exprs
                         ];
                     }
-                    const query = new Query({
+                    return new Query({
                         ...this.state,
-                        selectExpressions: exprs
+                        selectExpressions: exprs,
+                        calculation: false
                     });
-                    query.state.calculation = false;
-                    return query;
                 }
                 calculate(expr) {
-                    const query = this.select({
-                        result: expr
+                    return new Query({
+                        ...this.state,
+                        selectExpressions: [
+                            {
+                                result: expr
+                            }
+                        ],
+                        calculation: true
                     });
-                    query.state.calculation = true;
-                    return query;
                 }
                 groupBy(exprs) {
                     if (!Array.isArray(exprs)) {
@@ -52621,6 +53322,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 serialize() {
                     return this.state;
                 }
+                serializeAsString() {
+                    return JSON.stringify(this.serialize());
+                }
             }
             function getPrimaryOrderBy(query, defaultOrderBy) {
                 const orderExprs = query.serialize().orderExpressions;
@@ -52702,7 +53406,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         'oneOf',
                         'isNot',
                         'doesNotContain',
-                        'notOneOf'
+                        'notOneOf',
+                        'onBudget',
+                        'offBudget'
                     ],
                     nullable: true
                 },
@@ -52750,7 +53456,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     ])
                 },
                 payee: {
-                    type: 'id'
+                    type: 'id',
+                    disallowedOps: new Set([
+                        'onBudget',
+                        'offBudget'
+                    ])
                 },
                 payee_name: {
                     type: 'string'
@@ -52766,6 +53476,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 },
                 category: {
                     type: 'id',
+                    disallowedOps: new Set([
+                        'onBudget',
+                        'offBudget'
+                    ]),
                     internalOps: new Set([
                         'and'
                     ])
@@ -52897,6 +53611,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('and');
                     case 'or':
                         return 'or';
+                    case 'onBudget':
+                        return 'is on budget';
+                    case 'offBudget':
+                        return 'is off budget';
                     default:
                         return '';
                 }
@@ -53351,6 +54069,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 };
             }
             function getScheduledAmount(amount, inverse = false) {
+                // this check is temporary, and required at the moment as a schedule rule
+                // allows the amount condition to be deleted which causes a crash
+                if (amount == null)
+                    return 0;
                 if (typeof amount === 'number') {
                     return inverse ? -amount : amount;
                 }
@@ -53736,10 +54458,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ hasFieldsChanged: () => ( /* binding */hasFieldsChanged),
                 /* harmony export */ integerToAmount: () => ( /* binding */integerToAmount),
                 /* harmony export */ integerToCurrency: () => ( /* binding */integerToCurrency),
-                /* harmony export */ isNumberFormat: () => ( /* binding */isNumberFormat),
                 /* harmony export */ last: () => ( /* binding */last),
                 /* harmony export */ looselyParseAmount: () => ( /* binding */looselyParseAmount),
                 /* harmony export */ numberFormats: () => ( /* binding */numberFormats),
+                /* harmony export */ parseNumberFormat: () => ( /* binding */parseNumberFormat),
                 /* harmony export */ partitionByField: () => ( /* binding */partitionByField),
                 /* harmony export */ safeNumber: () => ( /* binding */safeNumber),
                 /* harmony export */ setIn: () => ( /* binding */setIn),
@@ -53973,6 +54695,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 format: 'comma-dot',
                 hideFraction: false
             };
+            function parseNumberFormat({ format, hideFraction }) {
+                return {
+                    format: isNumberFormat(format) ? format : 'comma-dot',
+                    hideFraction: String(hideFraction) === 'true'
+                };
+            }
             function setNumberFormat(config) {
                 numberFormatConfig = config;
             }
@@ -54485,7 +55213,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             (function () {
                 "use strict";
                 var builder, defaults, escapeCDATA, requiresCDATA, wrapCDATA, hasProp = {}.hasOwnProperty;
-                builder = __webpack_require__(/*! xmlbuilder */ "./node_modules/xmlbuilder/lib/index.js");
+                builder = __webpack_require__(/*! xmlbuilder */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/index.js");
                 defaults = (__webpack_require__(/*! ./defaults */ "./node_modules/xml2js/lib/defaults.js").defaults);
                 requiresCDATA = function (entry) {
                     return typeof entry === "string" && (entry.indexOf('&') >= 0 || entry.indexOf('>') >= 0 || entry.indexOf('<') >= 0);
@@ -55159,10 +55887,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/DocumentPosition.js": 
-        /*!*********************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/DocumentPosition.js ***!
-          \*********************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/DocumentPosition.js": 
+        /*!*****************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/DocumentPosition.js ***!
+          \*****************************************************************************/
         /***/ (function (module) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55177,10 +55905,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/NodeType.js": 
-        /*!*************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/NodeType.js ***!
-          \*************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js": 
+        /*!*********************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js ***!
+          \*********************************************************************/
         /***/ (function (module) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55206,10 +55934,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/Utility.js": 
-        /*!************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/Utility.js ***!
-          \************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/Utility.js": 
+        /*!********************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/Utility.js ***!
+          \********************************************************************/
         /***/ (function (module) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55285,10 +56013,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/WriterState.js": 
-        /*!****************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/WriterState.js ***!
-          \****************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/WriterState.js": 
+        /*!************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/WriterState.js ***!
+          \************************************************************************/
         /***/ (function (module) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55301,16 +56029,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLAttribute.js": 
-        /*!*****************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLAttribute.js ***!
-          \*****************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLAttribute.js": 
+        /*!*************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLAttribute.js ***!
+          \*************************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
                 var NodeType, XMLAttribute, XMLNode;
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
-                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xmlbuilder/lib/XMLNode.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
+                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNode.js");
                 module.exports = XMLAttribute = (function () {
                     function XMLAttribute(parent, name, value) {
                         this.parent = parent;
@@ -55400,10 +56128,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLCData.js": 
-        /*!*************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLCData.js ***!
-          \*************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLCData.js": 
+        /*!*********************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLCData.js ***!
+          \*********************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55411,8 +56139,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
-                XMLCharacterData = __webpack_require__(/*! ./XMLCharacterData */ "./node_modules/xmlbuilder/lib/XMLCharacterData.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
+                XMLCharacterData = __webpack_require__(/*! ./XMLCharacterData */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLCharacterData.js");
                 module.exports = XMLCData = (function (superClass) {
                     extend(XMLCData, superClass);
                     function XMLCData(parent, text) {
@@ -55435,10 +56163,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLCharacterData.js": 
-        /*!*********************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLCharacterData.js ***!
-          \*********************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLCharacterData.js": 
+        /*!*****************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLCharacterData.js ***!
+          \*****************************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55446,7 +56174,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xmlbuilder/lib/XMLNode.js");
+                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNode.js");
                 module.exports = XMLCharacterData = (function (superClass) {
                     extend(XMLCharacterData, superClass);
                     function XMLCharacterData(parent) {
@@ -55506,10 +56234,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLComment.js": 
-        /*!***************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLComment.js ***!
-          \***************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLComment.js": 
+        /*!***********************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLComment.js ***!
+          \***********************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55517,8 +56245,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
-                XMLCharacterData = __webpack_require__(/*! ./XMLCharacterData */ "./node_modules/xmlbuilder/lib/XMLCharacterData.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
+                XMLCharacterData = __webpack_require__(/*! ./XMLCharacterData */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLCharacterData.js");
                 module.exports = XMLComment = (function (superClass) {
                     extend(XMLComment, superClass);
                     function XMLComment(parent, text) {
@@ -55541,16 +56269,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLDOMConfiguration.js": 
-        /*!************************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLDOMConfiguration.js ***!
-          \************************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDOMConfiguration.js": 
+        /*!********************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDOMConfiguration.js ***!
+          \********************************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
                 var XMLDOMConfiguration, XMLDOMErrorHandler, XMLDOMStringList;
-                XMLDOMErrorHandler = __webpack_require__(/*! ./XMLDOMErrorHandler */ "./node_modules/xmlbuilder/lib/XMLDOMErrorHandler.js");
-                XMLDOMStringList = __webpack_require__(/*! ./XMLDOMStringList */ "./node_modules/xmlbuilder/lib/XMLDOMStringList.js");
+                XMLDOMErrorHandler = __webpack_require__(/*! ./XMLDOMErrorHandler */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDOMErrorHandler.js");
+                XMLDOMStringList = __webpack_require__(/*! ./XMLDOMStringList */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDOMStringList.js");
                 module.exports = XMLDOMConfiguration = (function () {
                     function XMLDOMConfiguration() {
                         var clonedSelf;
@@ -55604,10 +56332,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLDOMErrorHandler.js": 
-        /*!***********************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLDOMErrorHandler.js ***!
-          \***********************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDOMErrorHandler.js": 
+        /*!*******************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDOMErrorHandler.js ***!
+          \*******************************************************************************/
         /***/ (function (module) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55622,10 +56350,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLDOMImplementation.js": 
-        /*!*************************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLDOMImplementation.js ***!
-          \*************************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDOMImplementation.js": 
+        /*!*********************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDOMImplementation.js ***!
+          \*********************************************************************************/
         /***/ (function (module) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55652,10 +56380,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLDOMStringList.js": 
-        /*!*********************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLDOMStringList.js ***!
-          \*********************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDOMStringList.js": 
+        /*!*****************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDOMStringList.js ***!
+          \*****************************************************************************/
         /***/ (function (module) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55680,10 +56408,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLDTDAttList.js": 
-        /*!******************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLDTDAttList.js ***!
-          \******************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDAttList.js": 
+        /*!**************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDAttList.js ***!
+          \**************************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55691,8 +56419,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xmlbuilder/lib/XMLNode.js");
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
+                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNode.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
                 module.exports = XMLDTDAttList = (function (superClass) {
                     extend(XMLDTDAttList, superClass);
                     function XMLDTDAttList(parent, elementName, attributeName, attributeType, defaultValueType, defaultValue) {
@@ -55735,10 +56463,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLDTDElement.js": 
-        /*!******************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLDTDElement.js ***!
-          \******************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDElement.js": 
+        /*!**************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDElement.js ***!
+          \**************************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55746,8 +56474,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xmlbuilder/lib/XMLNode.js");
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
+                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNode.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
                 module.exports = XMLDTDElement = (function (superClass) {
                     extend(XMLDTDElement, superClass);
                     function XMLDTDElement(parent, name, value) {
@@ -55773,10 +56501,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLDTDEntity.js": 
-        /*!*****************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLDTDEntity.js ***!
-          \*****************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDEntity.js": 
+        /*!*************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDEntity.js ***!
+          \*************************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55784,9 +56512,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                isObject = (__webpack_require__(/*! ./Utility */ "./node_modules/xmlbuilder/lib/Utility.js").isObject);
-                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xmlbuilder/lib/XMLNode.js");
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
+                isObject = (__webpack_require__(/*! ./Utility */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/Utility.js").isObject);
+                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNode.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
                 module.exports = XMLDTDEntity = (function (superClass) {
                     extend(XMLDTDEntity, superClass);
                     function XMLDTDEntity(parent, pe, name, value) {
@@ -55864,10 +56592,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLDTDNotation.js": 
-        /*!*******************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLDTDNotation.js ***!
-          \*******************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDNotation.js": 
+        /*!***************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDNotation.js ***!
+          \***************************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55875,8 +56603,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xmlbuilder/lib/XMLNode.js");
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
+                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNode.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
                 module.exports = XMLDTDNotation = (function (superClass) {
                     extend(XMLDTDNotation, superClass);
                     function XMLDTDNotation(parent, name, value) {
@@ -55914,10 +56642,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLDeclaration.js": 
-        /*!*******************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLDeclaration.js ***!
-          \*******************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDeclaration.js": 
+        /*!***************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDeclaration.js ***!
+          \***************************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55925,9 +56653,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                isObject = (__webpack_require__(/*! ./Utility */ "./node_modules/xmlbuilder/lib/Utility.js").isObject);
-                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xmlbuilder/lib/XMLNode.js");
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
+                isObject = (__webpack_require__(/*! ./Utility */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/Utility.js").isObject);
+                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNode.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
                 module.exports = XMLDeclaration = (function (superClass) {
                     extend(XMLDeclaration, superClass);
                     function XMLDeclaration(parent, version, encoding, standalone) {
@@ -55956,10 +56684,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLDocType.js": 
-        /*!***************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLDocType.js ***!
-          \***************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDocType.js": 
+        /*!***********************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDocType.js ***!
+          \***********************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -55967,14 +56695,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                isObject = (__webpack_require__(/*! ./Utility */ "./node_modules/xmlbuilder/lib/Utility.js").isObject);
-                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xmlbuilder/lib/XMLNode.js");
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
-                XMLDTDAttList = __webpack_require__(/*! ./XMLDTDAttList */ "./node_modules/xmlbuilder/lib/XMLDTDAttList.js");
-                XMLDTDEntity = __webpack_require__(/*! ./XMLDTDEntity */ "./node_modules/xmlbuilder/lib/XMLDTDEntity.js");
-                XMLDTDElement = __webpack_require__(/*! ./XMLDTDElement */ "./node_modules/xmlbuilder/lib/XMLDTDElement.js");
-                XMLDTDNotation = __webpack_require__(/*! ./XMLDTDNotation */ "./node_modules/xmlbuilder/lib/XMLDTDNotation.js");
-                XMLNamedNodeMap = __webpack_require__(/*! ./XMLNamedNodeMap */ "./node_modules/xmlbuilder/lib/XMLNamedNodeMap.js");
+                isObject = (__webpack_require__(/*! ./Utility */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/Utility.js").isObject);
+                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNode.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
+                XMLDTDAttList = __webpack_require__(/*! ./XMLDTDAttList */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDAttList.js");
+                XMLDTDEntity = __webpack_require__(/*! ./XMLDTDEntity */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDEntity.js");
+                XMLDTDElement = __webpack_require__(/*! ./XMLDTDElement */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDElement.js");
+                XMLDTDNotation = __webpack_require__(/*! ./XMLDTDNotation */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDNotation.js");
+                XMLNamedNodeMap = __webpack_require__(/*! ./XMLNamedNodeMap */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNamedNodeMap.js");
                 module.exports = XMLDocType = (function (superClass) {
                     extend(XMLDocType, superClass);
                     function XMLDocType(parent, pubID, sysID) {
@@ -56119,10 +56847,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLDocument.js": 
-        /*!****************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLDocument.js ***!
-          \****************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDocument.js": 
+        /*!************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDocument.js ***!
+          \************************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -56130,13 +56858,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                isPlainObject = (__webpack_require__(/*! ./Utility */ "./node_modules/xmlbuilder/lib/Utility.js").isPlainObject);
-                XMLDOMImplementation = __webpack_require__(/*! ./XMLDOMImplementation */ "./node_modules/xmlbuilder/lib/XMLDOMImplementation.js");
-                XMLDOMConfiguration = __webpack_require__(/*! ./XMLDOMConfiguration */ "./node_modules/xmlbuilder/lib/XMLDOMConfiguration.js");
-                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xmlbuilder/lib/XMLNode.js");
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
-                XMLStringifier = __webpack_require__(/*! ./XMLStringifier */ "./node_modules/xmlbuilder/lib/XMLStringifier.js");
-                XMLStringWriter = __webpack_require__(/*! ./XMLStringWriter */ "./node_modules/xmlbuilder/lib/XMLStringWriter.js");
+                isPlainObject = (__webpack_require__(/*! ./Utility */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/Utility.js").isPlainObject);
+                XMLDOMImplementation = __webpack_require__(/*! ./XMLDOMImplementation */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDOMImplementation.js");
+                XMLDOMConfiguration = __webpack_require__(/*! ./XMLDOMConfiguration */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDOMConfiguration.js");
+                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNode.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
+                XMLStringifier = __webpack_require__(/*! ./XMLStringifier */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLStringifier.js");
+                XMLStringWriter = __webpack_require__(/*! ./XMLStringWriter */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLStringWriter.js");
                 module.exports = XMLDocument = (function (superClass) {
                     extend(XMLDocument, superClass);
                     function XMLDocument(options) {
@@ -56324,33 +57052,33 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLDocumentCB.js": 
-        /*!******************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLDocumentCB.js ***!
-          \******************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDocumentCB.js": 
+        /*!**************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDocumentCB.js ***!
+          \**************************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
                 var NodeType, WriterState, XMLAttribute, XMLCData, XMLComment, XMLDTDAttList, XMLDTDElement, XMLDTDEntity, XMLDTDNotation, XMLDeclaration, XMLDocType, XMLDocument, XMLDocumentCB, XMLElement, XMLProcessingInstruction, XMLRaw, XMLStringWriter, XMLStringifier, XMLText, getValue, isFunction, isObject, isPlainObject, ref, hasProp = {}.hasOwnProperty;
-                ref = __webpack_require__(/*! ./Utility */ "./node_modules/xmlbuilder/lib/Utility.js"), isObject = ref.isObject, isFunction = ref.isFunction, isPlainObject = ref.isPlainObject, getValue = ref.getValue;
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
-                XMLDocument = __webpack_require__(/*! ./XMLDocument */ "./node_modules/xmlbuilder/lib/XMLDocument.js");
-                XMLElement = __webpack_require__(/*! ./XMLElement */ "./node_modules/xmlbuilder/lib/XMLElement.js");
-                XMLCData = __webpack_require__(/*! ./XMLCData */ "./node_modules/xmlbuilder/lib/XMLCData.js");
-                XMLComment = __webpack_require__(/*! ./XMLComment */ "./node_modules/xmlbuilder/lib/XMLComment.js");
-                XMLRaw = __webpack_require__(/*! ./XMLRaw */ "./node_modules/xmlbuilder/lib/XMLRaw.js");
-                XMLText = __webpack_require__(/*! ./XMLText */ "./node_modules/xmlbuilder/lib/XMLText.js");
-                XMLProcessingInstruction = __webpack_require__(/*! ./XMLProcessingInstruction */ "./node_modules/xmlbuilder/lib/XMLProcessingInstruction.js");
-                XMLDeclaration = __webpack_require__(/*! ./XMLDeclaration */ "./node_modules/xmlbuilder/lib/XMLDeclaration.js");
-                XMLDocType = __webpack_require__(/*! ./XMLDocType */ "./node_modules/xmlbuilder/lib/XMLDocType.js");
-                XMLDTDAttList = __webpack_require__(/*! ./XMLDTDAttList */ "./node_modules/xmlbuilder/lib/XMLDTDAttList.js");
-                XMLDTDEntity = __webpack_require__(/*! ./XMLDTDEntity */ "./node_modules/xmlbuilder/lib/XMLDTDEntity.js");
-                XMLDTDElement = __webpack_require__(/*! ./XMLDTDElement */ "./node_modules/xmlbuilder/lib/XMLDTDElement.js");
-                XMLDTDNotation = __webpack_require__(/*! ./XMLDTDNotation */ "./node_modules/xmlbuilder/lib/XMLDTDNotation.js");
-                XMLAttribute = __webpack_require__(/*! ./XMLAttribute */ "./node_modules/xmlbuilder/lib/XMLAttribute.js");
-                XMLStringifier = __webpack_require__(/*! ./XMLStringifier */ "./node_modules/xmlbuilder/lib/XMLStringifier.js");
-                XMLStringWriter = __webpack_require__(/*! ./XMLStringWriter */ "./node_modules/xmlbuilder/lib/XMLStringWriter.js");
-                WriterState = __webpack_require__(/*! ./WriterState */ "./node_modules/xmlbuilder/lib/WriterState.js");
+                ref = __webpack_require__(/*! ./Utility */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/Utility.js"), isObject = ref.isObject, isFunction = ref.isFunction, isPlainObject = ref.isPlainObject, getValue = ref.getValue;
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
+                XMLDocument = __webpack_require__(/*! ./XMLDocument */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDocument.js");
+                XMLElement = __webpack_require__(/*! ./XMLElement */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLElement.js");
+                XMLCData = __webpack_require__(/*! ./XMLCData */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLCData.js");
+                XMLComment = __webpack_require__(/*! ./XMLComment */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLComment.js");
+                XMLRaw = __webpack_require__(/*! ./XMLRaw */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLRaw.js");
+                XMLText = __webpack_require__(/*! ./XMLText */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLText.js");
+                XMLProcessingInstruction = __webpack_require__(/*! ./XMLProcessingInstruction */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js");
+                XMLDeclaration = __webpack_require__(/*! ./XMLDeclaration */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDeclaration.js");
+                XMLDocType = __webpack_require__(/*! ./XMLDocType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDocType.js");
+                XMLDTDAttList = __webpack_require__(/*! ./XMLDTDAttList */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDAttList.js");
+                XMLDTDEntity = __webpack_require__(/*! ./XMLDTDEntity */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDEntity.js");
+                XMLDTDElement = __webpack_require__(/*! ./XMLDTDElement */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDElement.js");
+                XMLDTDNotation = __webpack_require__(/*! ./XMLDTDNotation */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDNotation.js");
+                XMLAttribute = __webpack_require__(/*! ./XMLAttribute */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLAttribute.js");
+                XMLStringifier = __webpack_require__(/*! ./XMLStringifier */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLStringifier.js");
+                XMLStringWriter = __webpack_require__(/*! ./XMLStringWriter */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLStringWriter.js");
+                WriterState = __webpack_require__(/*! ./WriterState */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/WriterState.js");
                 module.exports = XMLDocumentCB = (function () {
                     function XMLDocumentCB(options, onData, onEnd) {
                         var writerOptions;
@@ -56810,10 +57538,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLDummy.js": 
-        /*!*************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLDummy.js ***!
-          \*************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDummy.js": 
+        /*!*********************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDummy.js ***!
+          \*********************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -56821,8 +57549,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xmlbuilder/lib/XMLNode.js");
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
+                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNode.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
                 module.exports = XMLDummy = (function (superClass) {
                     extend(XMLDummy, superClass);
                     function XMLDummy(parent) {
@@ -56840,10 +57568,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLElement.js": 
-        /*!***************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLElement.js ***!
-          \***************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLElement.js": 
+        /*!***********************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLElement.js ***!
+          \***********************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -56851,11 +57579,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                ref = __webpack_require__(/*! ./Utility */ "./node_modules/xmlbuilder/lib/Utility.js"), isObject = ref.isObject, isFunction = ref.isFunction, getValue = ref.getValue;
-                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xmlbuilder/lib/XMLNode.js");
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
-                XMLAttribute = __webpack_require__(/*! ./XMLAttribute */ "./node_modules/xmlbuilder/lib/XMLAttribute.js");
-                XMLNamedNodeMap = __webpack_require__(/*! ./XMLNamedNodeMap */ "./node_modules/xmlbuilder/lib/XMLNamedNodeMap.js");
+                ref = __webpack_require__(/*! ./Utility */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/Utility.js"), isObject = ref.isObject, isFunction = ref.isFunction, getValue = ref.getValue;
+                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNode.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
+                XMLAttribute = __webpack_require__(/*! ./XMLAttribute */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLAttribute.js");
+                XMLNamedNodeMap = __webpack_require__(/*! ./XMLNamedNodeMap */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNamedNodeMap.js");
                 module.exports = XMLElement = (function (superClass) {
                     extend(XMLElement, superClass);
                     function XMLElement(parent, name, attributes) {
@@ -57109,10 +57837,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLNamedNodeMap.js": 
-        /*!********************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLNamedNodeMap.js ***!
-          \********************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNamedNodeMap.js": 
+        /*!****************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNamedNodeMap.js ***!
+          \****************************************************************************/
         /***/ (function (module) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -57161,15 +57889,15 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLNode.js": 
-        /*!************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLNode.js ***!
-          \************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNode.js": 
+        /*!********************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNode.js ***!
+          \********************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
                 var DocumentPosition, NodeType, XMLCData, XMLComment, XMLDeclaration, XMLDocType, XMLDummy, XMLElement, XMLNamedNodeMap, XMLNode, XMLNodeList, XMLProcessingInstruction, XMLRaw, XMLText, getValue, isEmpty, isFunction, isObject, ref1, hasProp = {}.hasOwnProperty;
-                ref1 = __webpack_require__(/*! ./Utility */ "./node_modules/xmlbuilder/lib/Utility.js"), isObject = ref1.isObject, isFunction = ref1.isFunction, isEmpty = ref1.isEmpty, getValue = ref1.getValue;
+                ref1 = __webpack_require__(/*! ./Utility */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/Utility.js"), isObject = ref1.isObject, isFunction = ref1.isFunction, isEmpty = ref1.isEmpty, getValue = ref1.getValue;
                 XMLElement = null;
                 XMLCData = null;
                 XMLComment = null;
@@ -57194,19 +57922,19 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         this.children = [];
                         this.baseURI = null;
                         if (!XMLElement) {
-                            XMLElement = __webpack_require__(/*! ./XMLElement */ "./node_modules/xmlbuilder/lib/XMLElement.js");
-                            XMLCData = __webpack_require__(/*! ./XMLCData */ "./node_modules/xmlbuilder/lib/XMLCData.js");
-                            XMLComment = __webpack_require__(/*! ./XMLComment */ "./node_modules/xmlbuilder/lib/XMLComment.js");
-                            XMLDeclaration = __webpack_require__(/*! ./XMLDeclaration */ "./node_modules/xmlbuilder/lib/XMLDeclaration.js");
-                            XMLDocType = __webpack_require__(/*! ./XMLDocType */ "./node_modules/xmlbuilder/lib/XMLDocType.js");
-                            XMLRaw = __webpack_require__(/*! ./XMLRaw */ "./node_modules/xmlbuilder/lib/XMLRaw.js");
-                            XMLText = __webpack_require__(/*! ./XMLText */ "./node_modules/xmlbuilder/lib/XMLText.js");
-                            XMLProcessingInstruction = __webpack_require__(/*! ./XMLProcessingInstruction */ "./node_modules/xmlbuilder/lib/XMLProcessingInstruction.js");
-                            XMLDummy = __webpack_require__(/*! ./XMLDummy */ "./node_modules/xmlbuilder/lib/XMLDummy.js");
-                            NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
-                            XMLNodeList = __webpack_require__(/*! ./XMLNodeList */ "./node_modules/xmlbuilder/lib/XMLNodeList.js");
-                            XMLNamedNodeMap = __webpack_require__(/*! ./XMLNamedNodeMap */ "./node_modules/xmlbuilder/lib/XMLNamedNodeMap.js");
-                            DocumentPosition = __webpack_require__(/*! ./DocumentPosition */ "./node_modules/xmlbuilder/lib/DocumentPosition.js");
+                            XMLElement = __webpack_require__(/*! ./XMLElement */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLElement.js");
+                            XMLCData = __webpack_require__(/*! ./XMLCData */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLCData.js");
+                            XMLComment = __webpack_require__(/*! ./XMLComment */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLComment.js");
+                            XMLDeclaration = __webpack_require__(/*! ./XMLDeclaration */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDeclaration.js");
+                            XMLDocType = __webpack_require__(/*! ./XMLDocType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDocType.js");
+                            XMLRaw = __webpack_require__(/*! ./XMLRaw */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLRaw.js");
+                            XMLText = __webpack_require__(/*! ./XMLText */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLText.js");
+                            XMLProcessingInstruction = __webpack_require__(/*! ./XMLProcessingInstruction */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js");
+                            XMLDummy = __webpack_require__(/*! ./XMLDummy */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDummy.js");
+                            NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
+                            XMLNodeList = __webpack_require__(/*! ./XMLNodeList */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNodeList.js");
+                            XMLNamedNodeMap = __webpack_require__(/*! ./XMLNamedNodeMap */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNamedNodeMap.js");
+                            DocumentPosition = __webpack_require__(/*! ./DocumentPosition */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/DocumentPosition.js");
                         }
                     }
                     Object.defineProperty(XMLNode.prototype, 'nodeName', {
@@ -57897,10 +58625,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLNodeList.js": 
-        /*!****************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLNodeList.js ***!
-          \****************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNodeList.js": 
+        /*!************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNodeList.js ***!
+          \************************************************************************/
         /***/ (function (module) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -57925,10 +58653,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLProcessingInstruction.js": 
-        /*!*****************************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLProcessingInstruction.js ***!
-          \*****************************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js": 
+        /*!*************************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js ***!
+          \*************************************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -57936,8 +58664,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
-                XMLCharacterData = __webpack_require__(/*! ./XMLCharacterData */ "./node_modules/xmlbuilder/lib/XMLCharacterData.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
+                XMLCharacterData = __webpack_require__(/*! ./XMLCharacterData */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLCharacterData.js");
                 module.exports = XMLProcessingInstruction = (function (superClass) {
                     extend(XMLProcessingInstruction, superClass);
                     function XMLProcessingInstruction(parent, target, value) {
@@ -57972,10 +58700,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLRaw.js": 
-        /*!***********************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLRaw.js ***!
-          \***********************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLRaw.js": 
+        /*!*******************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLRaw.js ***!
+          \*******************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -57983,8 +58711,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
-                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xmlbuilder/lib/XMLNode.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
+                XMLNode = __webpack_require__(/*! ./XMLNode */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLNode.js");
                 module.exports = XMLRaw = (function (superClass) {
                     extend(XMLRaw, superClass);
                     function XMLRaw(parent, text) {
@@ -58006,10 +58734,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLStreamWriter.js": 
-        /*!********************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLStreamWriter.js ***!
-          \********************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLStreamWriter.js": 
+        /*!****************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLStreamWriter.js ***!
+          \****************************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -58017,9 +58745,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
-                XMLWriterBase = __webpack_require__(/*! ./XMLWriterBase */ "./node_modules/xmlbuilder/lib/XMLWriterBase.js");
-                WriterState = __webpack_require__(/*! ./WriterState */ "./node_modules/xmlbuilder/lib/WriterState.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
+                XMLWriterBase = __webpack_require__(/*! ./XMLWriterBase */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLWriterBase.js");
+                WriterState = __webpack_require__(/*! ./WriterState */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/WriterState.js");
                 module.exports = XMLStreamWriter = (function (superClass) {
                     extend(XMLStreamWriter, superClass);
                     function XMLStreamWriter(stream, options) {
@@ -58173,10 +58901,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLStringWriter.js": 
-        /*!********************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLStringWriter.js ***!
-          \********************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLStringWriter.js": 
+        /*!****************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLStringWriter.js ***!
+          \****************************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -58184,7 +58912,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                XMLWriterBase = __webpack_require__(/*! ./XMLWriterBase */ "./node_modules/xmlbuilder/lib/XMLWriterBase.js");
+                XMLWriterBase = __webpack_require__(/*! ./XMLWriterBase */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLWriterBase.js");
                 module.exports = XMLStringWriter = (function (superClass) {
                     extend(XMLStringWriter, superClass);
                     function XMLStringWriter(options) {
@@ -58209,10 +58937,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLStringifier.js": 
-        /*!*******************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLStringifier.js ***!
-          \*******************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLStringifier.js": 
+        /*!***************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLStringifier.js ***!
+          \***************************************************************************/
         /***/ (function (module) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -58425,10 +59153,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLText.js": 
-        /*!************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLText.js ***!
-          \************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLText.js": 
+        /*!********************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLText.js ***!
+          \********************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
@@ -58436,8 +59164,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hasProp.call(parent, key))
                         child[key] = parent[key];
                 } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, hasProp = {}.hasOwnProperty;
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
-                XMLCharacterData = __webpack_require__(/*! ./XMLCharacterData */ "./node_modules/xmlbuilder/lib/XMLCharacterData.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
+                XMLCharacterData = __webpack_require__(/*! ./XMLCharacterData */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLCharacterData.js");
                 module.exports = XMLText = (function (superClass) {
                     extend(XMLText, superClass);
                     function XMLText(parent, text) {
@@ -58489,30 +59217,30 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/XMLWriterBase.js": 
-        /*!******************************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/XMLWriterBase.js ***!
-          \******************************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLWriterBase.js": 
+        /*!**************************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLWriterBase.js ***!
+          \**************************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
                 var NodeType, WriterState, XMLCData, XMLComment, XMLDTDAttList, XMLDTDElement, XMLDTDEntity, XMLDTDNotation, XMLDeclaration, XMLDocType, XMLDummy, XMLElement, XMLProcessingInstruction, XMLRaw, XMLText, XMLWriterBase, assign, hasProp = {}.hasOwnProperty;
-                assign = (__webpack_require__(/*! ./Utility */ "./node_modules/xmlbuilder/lib/Utility.js").assign);
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
-                XMLDeclaration = __webpack_require__(/*! ./XMLDeclaration */ "./node_modules/xmlbuilder/lib/XMLDeclaration.js");
-                XMLDocType = __webpack_require__(/*! ./XMLDocType */ "./node_modules/xmlbuilder/lib/XMLDocType.js");
-                XMLCData = __webpack_require__(/*! ./XMLCData */ "./node_modules/xmlbuilder/lib/XMLCData.js");
-                XMLComment = __webpack_require__(/*! ./XMLComment */ "./node_modules/xmlbuilder/lib/XMLComment.js");
-                XMLElement = __webpack_require__(/*! ./XMLElement */ "./node_modules/xmlbuilder/lib/XMLElement.js");
-                XMLRaw = __webpack_require__(/*! ./XMLRaw */ "./node_modules/xmlbuilder/lib/XMLRaw.js");
-                XMLText = __webpack_require__(/*! ./XMLText */ "./node_modules/xmlbuilder/lib/XMLText.js");
-                XMLProcessingInstruction = __webpack_require__(/*! ./XMLProcessingInstruction */ "./node_modules/xmlbuilder/lib/XMLProcessingInstruction.js");
-                XMLDummy = __webpack_require__(/*! ./XMLDummy */ "./node_modules/xmlbuilder/lib/XMLDummy.js");
-                XMLDTDAttList = __webpack_require__(/*! ./XMLDTDAttList */ "./node_modules/xmlbuilder/lib/XMLDTDAttList.js");
-                XMLDTDElement = __webpack_require__(/*! ./XMLDTDElement */ "./node_modules/xmlbuilder/lib/XMLDTDElement.js");
-                XMLDTDEntity = __webpack_require__(/*! ./XMLDTDEntity */ "./node_modules/xmlbuilder/lib/XMLDTDEntity.js");
-                XMLDTDNotation = __webpack_require__(/*! ./XMLDTDNotation */ "./node_modules/xmlbuilder/lib/XMLDTDNotation.js");
-                WriterState = __webpack_require__(/*! ./WriterState */ "./node_modules/xmlbuilder/lib/WriterState.js");
+                assign = (__webpack_require__(/*! ./Utility */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/Utility.js").assign);
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
+                XMLDeclaration = __webpack_require__(/*! ./XMLDeclaration */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDeclaration.js");
+                XMLDocType = __webpack_require__(/*! ./XMLDocType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDocType.js");
+                XMLCData = __webpack_require__(/*! ./XMLCData */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLCData.js");
+                XMLComment = __webpack_require__(/*! ./XMLComment */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLComment.js");
+                XMLElement = __webpack_require__(/*! ./XMLElement */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLElement.js");
+                XMLRaw = __webpack_require__(/*! ./XMLRaw */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLRaw.js");
+                XMLText = __webpack_require__(/*! ./XMLText */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLText.js");
+                XMLProcessingInstruction = __webpack_require__(/*! ./XMLProcessingInstruction */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js");
+                XMLDummy = __webpack_require__(/*! ./XMLDummy */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDummy.js");
+                XMLDTDAttList = __webpack_require__(/*! ./XMLDTDAttList */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDAttList.js");
+                XMLDTDElement = __webpack_require__(/*! ./XMLDTDElement */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDElement.js");
+                XMLDTDEntity = __webpack_require__(/*! ./XMLDTDEntity */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDEntity.js");
+                XMLDTDNotation = __webpack_require__(/*! ./XMLDTDNotation */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDTDNotation.js");
+                WriterState = __webpack_require__(/*! ./WriterState */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/WriterState.js");
                 module.exports = XMLWriterBase = (function () {
                     function XMLWriterBase(options) {
                         var key, ref, value;
@@ -58894,22 +59622,22 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }).call(this);
             /***/ 
         }),
-        /***/ "./node_modules/xmlbuilder/lib/index.js": 
-        /*!**********************************************!*\
-          !*** ./node_modules/xmlbuilder/lib/index.js ***!
-          \**********************************************/
+        /***/ "./node_modules/xml2js/node_modules/xmlbuilder/lib/index.js": 
+        /*!******************************************************************!*\
+          !*** ./node_modules/xml2js/node_modules/xmlbuilder/lib/index.js ***!
+          \******************************************************************/
         /***/ (function (module, __unused_webpack_exports, __webpack_require__) {
             // Generated by CoffeeScript 1.12.7
             (function () {
                 var NodeType, WriterState, XMLDOMImplementation, XMLDocument, XMLDocumentCB, XMLStreamWriter, XMLStringWriter, assign, isFunction, ref;
-                ref = __webpack_require__(/*! ./Utility */ "./node_modules/xmlbuilder/lib/Utility.js"), assign = ref.assign, isFunction = ref.isFunction;
-                XMLDOMImplementation = __webpack_require__(/*! ./XMLDOMImplementation */ "./node_modules/xmlbuilder/lib/XMLDOMImplementation.js");
-                XMLDocument = __webpack_require__(/*! ./XMLDocument */ "./node_modules/xmlbuilder/lib/XMLDocument.js");
-                XMLDocumentCB = __webpack_require__(/*! ./XMLDocumentCB */ "./node_modules/xmlbuilder/lib/XMLDocumentCB.js");
-                XMLStringWriter = __webpack_require__(/*! ./XMLStringWriter */ "./node_modules/xmlbuilder/lib/XMLStringWriter.js");
-                XMLStreamWriter = __webpack_require__(/*! ./XMLStreamWriter */ "./node_modules/xmlbuilder/lib/XMLStreamWriter.js");
-                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xmlbuilder/lib/NodeType.js");
-                WriterState = __webpack_require__(/*! ./WriterState */ "./node_modules/xmlbuilder/lib/WriterState.js");
+                ref = __webpack_require__(/*! ./Utility */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/Utility.js"), assign = ref.assign, isFunction = ref.isFunction;
+                XMLDOMImplementation = __webpack_require__(/*! ./XMLDOMImplementation */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDOMImplementation.js");
+                XMLDocument = __webpack_require__(/*! ./XMLDocument */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDocument.js");
+                XMLDocumentCB = __webpack_require__(/*! ./XMLDocumentCB */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLDocumentCB.js");
+                XMLStringWriter = __webpack_require__(/*! ./XMLStringWriter */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLStringWriter.js");
+                XMLStreamWriter = __webpack_require__(/*! ./XMLStreamWriter */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/XMLStreamWriter.js");
+                NodeType = __webpack_require__(/*! ./NodeType */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/NodeType.js");
+                WriterState = __webpack_require__(/*! ./WriterState */ "./node_modules/xml2js/node_modules/xmlbuilder/lib/WriterState.js");
                 module.exports.create = function (name, xmldec, doctype, options) {
                     var doc, root;
                     if (name == null) {
@@ -59941,12 +60669,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     var peg$e33 = peg$otherExpectation("number");
                     var peg$e34 = peg$classExpectation([["1", "9"]], false, false);
                     var peg$e35 = peg$otherExpectation("amount");
-                    var peg$e36 = peg$literalExpectation(".", false);
-                    var peg$e37 = peg$otherExpectation("percentage");
-                    var peg$e38 = peg$literalExpectation("%", false);
-                    var peg$e39 = peg$otherExpectation("year");
-                    var peg$e40 = peg$otherExpectation("month");
-                    var peg$e41 = peg$literalExpectation("-", false);
+                    var peg$e36 = peg$literalExpectation("-", false);
+                    var peg$e37 = peg$literalExpectation(".", false);
+                    var peg$e38 = peg$otherExpectation("percentage");
+                    var peg$e39 = peg$literalExpectation("%", false);
+                    var peg$e40 = peg$otherExpectation("year");
+                    var peg$e41 = peg$otherExpectation("month");
                     var peg$e42 = peg$otherExpectation("day");
                     var peg$e43 = peg$otherExpectation("currency symbol");
                     var peg$e44 = peg$anyExpectation();
@@ -61592,7 +62320,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         return s0;
                     }
                     function peg$parseamount() {
-                        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
+                        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11;
                         peg$silentFails++;
                         s0 = peg$currPos;
                         s1 = peg$parsecurrencySymbol();
@@ -61605,58 +62333,71 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                         s3 = peg$currPos;
                         s4 = peg$currPos;
-                        s5 = [];
-                        s6 = peg$parsed();
-                        if (s6 !== peg$FAILED) {
-                            while (s6 !== peg$FAILED) {
-                                s5.push(s6);
-                                s6 = peg$parsed();
-                            }
+                        if (input.charCodeAt(peg$currPos) === 45) {
+                            s5 = peg$c24;
+                            peg$currPos++;
                         }
                         else {
                             s5 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$e36);
+                            }
+                        }
+                        if (s5 === peg$FAILED) {
+                            s5 = null;
+                        }
+                        s6 = [];
+                        s7 = peg$parsed();
+                        if (s7 !== peg$FAILED) {
+                            while (s7 !== peg$FAILED) {
+                                s6.push(s7);
+                                s7 = peg$parsed();
+                            }
+                        }
+                        else {
+                            s6 = peg$FAILED;
                         }
-                        if (s5 !== peg$FAILED) {
-                            s6 = peg$currPos;
+                        if (s6 !== peg$FAILED) {
+                            s7 = peg$currPos;
                             if (input.charCodeAt(peg$currPos) === 46) {
-                                s7 = peg$c29;
+                                s8 = peg$c29;
                                 peg$currPos++;
                             }
                             else {
-                                s7 = peg$FAILED;
+                                s8 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e36);
+                                    peg$fail(peg$e37);
                                 }
                             }
-                            if (s7 !== peg$FAILED) {
-                                s8 = peg$currPos;
-                                s9 = peg$parsed();
-                                if (s9 !== peg$FAILED) {
-                                    s10 = peg$parsed();
-                                    if (s10 === peg$FAILED) {
-                                        s10 = null;
+                            if (s8 !== peg$FAILED) {
+                                s9 = peg$currPos;
+                                s10 = peg$parsed();
+                                if (s10 !== peg$FAILED) {
+                                    s11 = peg$parsed();
+                                    if (s11 === peg$FAILED) {
+                                        s11 = null;
                                     }
-                                    s9 = [s9, s10];
-                                    s8 = s9;
+                                    s10 = [s10, s11];
+                                    s9 = s10;
                                 }
                                 else {
-                                    peg$currPos = s8;
-                                    s8 = peg$FAILED;
+                                    peg$currPos = s9;
+                                    s9 = peg$FAILED;
                                 }
-                                if (s8 === peg$FAILED) {
-                                    s8 = null;
+                                if (s9 === peg$FAILED) {
+                                    s9 = null;
                                 }
-                                s7 = [s7, s8];
-                                s6 = s7;
+                                s8 = [s8, s9];
+                                s7 = s8;
                             }
                             else {
-                                peg$currPos = s6;
-                                s6 = peg$FAILED;
+                                peg$currPos = s7;
+                                s7 = peg$FAILED;
                             }
-                            if (s6 === peg$FAILED) {
-                                s6 = null;
+                            if (s7 === peg$FAILED) {
+                                s7 = null;
                             }
-                            s5 = [s5, s6];
+                            s5 = [s5, s6, s7];
                             s4 = s5;
                         }
                         else {
@@ -61712,7 +62453,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             else {
                                 s5 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e36);
+                                    peg$fail(peg$e37);
                                 }
                             }
                             if (s5 !== peg$FAILED) {
@@ -61765,7 +62506,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             else {
                                 s3 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e38);
+                                    peg$fail(peg$e39);
                                 }
                             }
                             if (s3 !== peg$FAILED) {
@@ -61785,7 +62526,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e37);
+                                peg$fail(peg$e38);
                             }
                         }
                         return s0;
@@ -61835,7 +62576,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e39);
+                                peg$fail(peg$e40);
                             }
                         }
                         return s0;
@@ -61854,7 +62595,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             else {
                                 s3 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e41);
+                                    peg$fail(peg$e36);
                                 }
                             }
                             if (s3 !== peg$FAILED) {
@@ -61894,7 +62635,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e40);
+                                peg$fail(peg$e41);
                             }
                         }
                         return s0;
@@ -61948,7 +62689,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             else {
                                 s3 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e41);
+                                    peg$fail(peg$e36);
                                 }
                             }
                             if (s3 !== peg$FAILED) {