diff --git a/app/src/main/groovy/se/alipsa/accounting/mcp/AccountUpdateMcpSupport.groovy b/app/src/main/groovy/se/alipsa/accounting/mcp/AccountUpdateMcpSupport.groovy new file mode 100644 index 0000000..d888fa0 --- /dev/null +++ b/app/src/main/groovy/se/alipsa/accounting/mcp/AccountUpdateMcpSupport.groovy @@ -0,0 +1,169 @@ +package se.alipsa.accounting.mcp + +import se.alipsa.accounting.domain.Account +import se.alipsa.accounting.domain.VatCode +import se.alipsa.accounting.service.AccountService + +import java.util.concurrent.ConcurrentHashMap + +/** + * Backs the preview_account_update and update_account MCP tools. Previews a classification + * change with its blast radius (including a warning when the account is used in closed fiscal + * years, since reclassification restates their reports), issues single-use preview tokens bound + * to the account's current state and per-account write sequence, and applies the change through + * the account service. + */ +final class AccountUpdateMcpSupport { + + private final AccountService accountService + private final PreviewTokenLedger previewTokenLedger = new PreviewTokenLedger() + private final Map accountUpdateSequences = new ConcurrentHashMap<>() + + AccountUpdateMcpSupport(AccountService accountService) { + this.accountService = accountService + } + + Map preview(Map args) { + long companyId = McpArgs.requiredLong(args, 'company_id') + String accountNumber = McpArgs.requiredString(args, 'account_number') + String accountClass = McpArgs.requiredString(args, 'account_class').toUpperCase(Locale.ROOT) + String normalBalanceSide = McpArgs.requiredString(args, 'normal_balance_side').toUpperCase(Locale.ROOT) + try { + if (!AccountService.isKnownAccountClass(accountClass)) { + return [ok: false, errors: ["Okänd kontoklass: ${accountClass}".toString()], warnings: []] + } + if (!AccountService.isKnownNormalBalanceSide(normalBalanceSide)) { + return [ok: false, errors: ["Okänd normalsida: ${normalBalanceSide}".toString()], warnings: []] + } + Account account = accountService.findAccount(companyId, accountNumber) + if (account == null) { + return [ok: false, errors: ["Okänt kontonummer: ${accountNumber}".toString()], warnings: []] + } + List errors = [] + if (account.vatCode) { + VatCode currentVatCode = AccountService.parseVatCode(account.vatCode) + if (currentVatCode == null) { + errors.add("Kontots momskod ${account.vatCode} är okänd och kan inte kombineras med kontoklass ${accountClass}.".toString()) + } else if (!AccountService.isVatCompatible(new Account(accountClass: accountClass), currentVatCode)) { + errors.add( + "Kontoklass ${accountClass} är inte kompatibelt med kontots momskod ${account.vatCode}.".toString() + ) + } + } + AccountService.AccountUsageSummary usage = accountService.summarizeAccountUsage(companyId, accountNumber) + boolean unchanged = account.accountClass == accountClass && + account.normalBalanceSide == normalBalanceSide && + !account.manualReviewRequired && + !account.classificationNote + boolean valid = errors.isEmpty() + List warnings = [] + if (usage.closedFiscalYearCount > 0) { + String years = usage.closedFiscalYearCount == 1 ? 'stängt räkenskapsår' : 'stängda räkenskapsår' + warnings << ("Kontot har bokförda transaktioner i ${usage.closedFiscalYearCount} ${years}; " + + 'omklassificering ändrar rapporterna för dessa år i efterhand.' as String) + } + // Only a flip to or from CREDIT changes how stored amounts are read; a missing side is + // treated as DEBIT everywhere, so null -> DEBIT is not a sign change. + boolean sideFlips = (account.normalBalanceSide == 'CREDIT') != (normalBalanceSide == 'CREDIT') + if (sideFlips && usage.openingBalanceYearCount > 0) { + warnings << ("Byte av normalsida vänder tecknet på kontots ingående balanser i " + + "${usage.openingBalanceYearCount} räkenskapsår." as String) + } + [ + ok: valid, + errors: errors, + warnings: warnings, + unchanged: unchanged, + account: AccountingMcpTools.accountMap(account), + proposed: [ + account_class: accountClass, + normal_balance_side: normalBalanceSide + ], + usage: [ + voucher_count: usage.voucherCount, + voucher_line_count: usage.voucherLineCount, + fiscal_year_count: usage.fiscalYearCount, + closed_fiscal_year_count: usage.closedFiscalYearCount, + opening_balance_year_count: usage.openingBalanceYearCount + ], + // No token when nothing would change; re-applying an already-used state must not + // return the identical, consumed token. The token binds the account's current state + // and its per-account write sequence, so a change made elsewhere after the preview + // invalidates it and no state sequence can ever repeat a consumed token. + preview_token: valid && !unchanged + ? accountUpdateToken(companyId, accountNumber, accountClass, normalBalanceSide, account) + : null + ] + } catch (Exception exception) { + [ok: false, errors: [exception.message ?: exception.class.simpleName], warnings: []] + } + } + + Map apply(Map args) { + long companyId = McpArgs.requiredLong(args, 'company_id') + String accountNumber = McpArgs.requiredString(args, 'account_number') + String accountClass = McpArgs.requiredString(args, 'account_class').toUpperCase(Locale.ROOT) + String normalBalanceSide = McpArgs.requiredString(args, 'normal_balance_side').toUpperCase(Locale.ROOT) + String providedToken = args.get('preview_token') as String + if (!providedToken) { + return [ok: false, errors: ['preview_token krävs — kör preview_account_update först.']] + } + String token = "account-update:${providedToken}" + try { + Account current = accountService.findAccount(companyId, accountNumber) + if (current == null) { + return [ok: false, errors: ["Okänt kontonummer: ${accountNumber}".toString()]] + } + String expectedToken = accountUpdateToken(companyId, accountNumber, accountClass, normalBalanceSide, current) + if (providedToken != expectedToken) { + return [ok: false, errors: ['preview_token matchar inte kontot eller de förhandsgranskade värdena — kör preview_account_update igen.']] + } + if (!previewTokenLedger.reserve(token)) { + return [ok: false, errors: ['preview_token har redan använts — kör preview_account_update igen.']] + } + Account updated = (Account) previewTokenLedger.executeReservedWrite(token) { + accountService.updateAccountClassification(companyId, accountNumber, accountClass, normalBalanceSide) + } + accountUpdateSequences.merge(accountUpdateSequenceKey(companyId, accountNumber), 1) { Integer oldValue, Integer newValue -> + oldValue + newValue + } + [ok: true, account: AccountingMcpTools.accountMap(updated)] + } catch (Exception exception) { + [ok: false, errors: [exception.message ?: exception.class.simpleName]] + } + } + + private String accountUpdateToken( + long companyId, + String accountNumber, + String accountClass, + String normalBalanceSide, + Account currentState + ) { + AccountingMcpTools.computePreviewToken([ + company_id: companyId, + account_number: accountNumber, + account_class: accountClass, + normal_balance_side: normalBalanceSide, + // Bind the token to the account's current state so an outdated preview (changed + // elsewhere after previewing) no longer matches. The per-account write sequence makes + // the token strictly increasing: it is raised on every successful MCP account update, + // so even when the account returns to an earlier state (A->B->A->B) the token never + // repeats a consumed one - while writes to other accounts or unrelated audit entries + // do not invalidate it. + current_account_class: currentState?.accountClass, + current_normal_balance_side: currentState?.normalBalanceSide, + vat_code: currentState?.vatCode, + manual_review_required: currentState?.manualReviewRequired, + update_sequence: accountUpdateSequence(companyId, accountNumber) + ]) + } + + private int accountUpdateSequence(long companyId, String accountNumber) { + accountUpdateSequences.getOrDefault(accountUpdateSequenceKey(companyId, accountNumber), 0) + } + + private static String accountUpdateSequenceKey(long companyId, String accountNumber) { + "${companyId}:${accountNumber}" + } +} diff --git a/app/src/main/groovy/se/alipsa/accounting/mcp/AccountingMcpTools.groovy b/app/src/main/groovy/se/alipsa/accounting/mcp/AccountingMcpTools.groovy index d8cc019..870542f 100644 --- a/app/src/main/groovy/se/alipsa/accounting/mcp/AccountingMcpTools.groovy +++ b/app/src/main/groovy/se/alipsa/accounting/mcp/AccountingMcpTools.groovy @@ -1,13 +1,13 @@ package se.alipsa.accounting.mcp import groovy.json.JsonOutput +import groovy.transform.PackageScope import se.alipsa.accounting.domain.Account import se.alipsa.accounting.domain.AccountingInstruction import se.alipsa.accounting.domain.Company import se.alipsa.accounting.domain.FiscalYear import se.alipsa.accounting.domain.ImportJob -import se.alipsa.accounting.domain.VatCode import se.alipsa.accounting.domain.VatPeriod import se.alipsa.accounting.domain.Voucher import se.alipsa.accounting.domain.VoucherLine @@ -41,7 +41,6 @@ import java.time.LocalDate import java.time.LocalDateTime import java.time.format.DateTimeFormatter import java.time.format.DateTimeParseException -import java.util.concurrent.ConcurrentHashMap import java.util.logging.Level import java.util.logging.Logger @@ -66,11 +65,7 @@ class AccountingMcpTools { private Closure> activeContextProvider private final PreviewTokenLedger previewTokenLedger = new PreviewTokenLedger() private final AiWorkspacePermissions aiWorkspacePermissions = new AiWorkspacePermissions() - // Per-account write sequence for preview tokens: raised on every successful MCP account - // update, so a token can never repeat even when the account returns to an earlier state - // (A->B->A->B). Independent per account, so previews of different accounts stay valid - // regardless of the order they are confirmed in. - private final Map accountUpdateSequences = new ConcurrentHashMap<>() + private final AccountUpdateMcpSupport accountUpdateSupport AccountingMcpTools() { this( @@ -149,6 +144,7 @@ class AccountingMcpTools { this.reportDataService = reportDataService this.sieImportExportService = sieImportExportService this.accountingInstructionService = accountingInstructionService + this.accountUpdateSupport = new AccountUpdateMcpSupport(accountService) } List> listTools() { @@ -176,9 +172,9 @@ class AccountingMcpTools { case 'list_accounts': return listAccounts(arguments) case 'preview_account_update': - return previewAccountUpdate(arguments) + return accountUpdateSupport.preview(arguments) case 'update_account': - return updateAccount(arguments) + return accountUpdateSupport.apply(arguments) case 'list_accounting_instructions': return listAccountingInstructions(arguments) case 'list_vouchers': @@ -298,11 +294,11 @@ class AccountingMcpTools { private Map saveAccountingInstruction(Map args) { AccountingInstruction instruction = accountingInstructionService.save( - requiredLong(args, 'company_id'), - requiredString(args, 'trigger_text'), + McpArgs.requiredLong(args, 'company_id'), + McpArgs.requiredString(args, 'trigger_text'), args.get('description') as String, - requiredString(args, 'debit_account_number'), - requiredString(args, 'credit_account_number'), + McpArgs.requiredString(args, 'debit_account_number'), + McpArgs.requiredString(args, 'credit_account_number'), args.get('series_code') as String ) [ok: true, instruction: instructionMap(instruction)] @@ -313,7 +309,7 @@ class AccountingMcpTools { } private Map getCompanyInfo(Map args) { - long companyId = requiredLong(args, 'company_id') + long companyId = McpArgs.requiredLong(args, 'company_id') Company company = companyService.findById(companyId) if (company == null) { return [ok: false, error: "Company ${companyId} not found."] @@ -336,7 +332,7 @@ class AccountingMcpTools { } private Map listFiscalYears(Map args) { - long companyId = requiredLong(args, 'company_id') + long companyId = McpArgs.requiredLong(args, 'company_id') List years = fiscalYearService.listFiscalYears(companyId) [ ok: true, @@ -353,7 +349,7 @@ class AccountingMcpTools { } private Map listAccounts(Map args) { - long companyId = requiredLong(args, 'company_id') + long companyId = McpArgs.requiredLong(args, 'company_id') String query = args.get('query') as String boolean manualReviewOnly = optionalBoolean(args, 'manual_review_required', false) boolean unclassifiedOnly = optionalBoolean(args, 'unclassified', false) @@ -367,101 +363,8 @@ class AccountingMcpTools { ] } - private Map previewAccountUpdate(Map args) { - long companyId = requiredLong(args, 'company_id') - String accountNumber = requiredString(args, 'account_number') - String accountClass = requiredString(args, 'account_class').toUpperCase(Locale.ROOT) - String normalBalanceSide = requiredString(args, 'normal_balance_side').toUpperCase(Locale.ROOT) - try { - if (!AccountService.isKnownAccountClass(accountClass)) { - return [ok: false, errors: ["Okänd kontoklass: ${accountClass}".toString()]] - } - if (!AccountService.isKnownNormalBalanceSide(normalBalanceSide)) { - return [ok: false, errors: ["Okänd normalsida: ${normalBalanceSide}".toString()]] - } - Account account = accountService.findAccount(companyId, accountNumber) - if (account == null) { - return [ok: false, errors: ["Okänt kontonummer: ${accountNumber}".toString()]] - } - List errors = [] - if (account.vatCode) { - VatCode currentVatCode = AccountService.parseVatCode(account.vatCode) - if (currentVatCode == null) { - errors.add("Kontots momskod ${account.vatCode} är okänd och kan inte kombineras med kontoklass ${accountClass}.".toString()) - } else if (!AccountService.isVatCompatible(new Account(accountClass: accountClass), currentVatCode)) { - errors.add( - "Kontoklass ${accountClass} är inte kompatibelt med kontots momskod ${account.vatCode}.".toString() - ) - } - } - AccountService.AccountUsageSummary usage = accountService.summarizeAccountUsage(companyId, accountNumber) - boolean unchanged = account.accountClass == accountClass && - account.normalBalanceSide == normalBalanceSide && - !account.manualReviewRequired && - !account.classificationNote - boolean valid = errors.isEmpty() - [ - ok: valid, - errors: errors, - unchanged: unchanged, - account: accountMap(account), - proposed: [ - account_class: accountClass, - normal_balance_side: normalBalanceSide - ], - usage: [ - voucher_count: usage.voucherCount, - voucher_line_count: usage.voucherLineCount, - fiscal_year_count: usage.fiscalYearCount - ], - // No token when nothing would change; re-applying an already-used state must not - // return the identical, consumed token. The token binds the account's current state - // and its per-account write sequence, so a change made elsewhere after the preview - // invalidates it and no state sequence can ever repeat a consumed token. - preview_token: valid && !unchanged - ? accountUpdateToken(companyId, accountNumber, accountClass, normalBalanceSide, account) - : null - ] - } catch (Exception exception) { - [ok: false, errors: [exception.message ?: exception.class.simpleName]] - } - } - - private Map updateAccount(Map args) { - long companyId = requiredLong(args, 'company_id') - String accountNumber = requiredString(args, 'account_number') - String accountClass = requiredString(args, 'account_class').toUpperCase(Locale.ROOT) - String normalBalanceSide = requiredString(args, 'normal_balance_side').toUpperCase(Locale.ROOT) - String providedToken = args.get('preview_token') as String - if (!providedToken) { - return [ok: false, errors: ['preview_token krävs — kör preview_account_update först.']] - } - String token = "account-update:${providedToken}" - try { - Account current = accountService.findAccount(companyId, accountNumber) - if (current == null) { - return [ok: false, errors: ["Okänt kontonummer: ${accountNumber}".toString()]] - } - String expectedToken = accountUpdateToken(companyId, accountNumber, accountClass, normalBalanceSide, current) - if (providedToken != expectedToken) { - return [ok: false, errors: ['preview_token matchar inte kontot eller de förhandsgranskade värdena — kör preview_account_update igen.']] - } - if (!previewTokenLedger.reserve(token)) { - return [ok: false, errors: ['preview_token har redan använts — kör preview_account_update igen.']] - } - Account updated = (Account) previewTokenLedger.executeReservedWrite(token) { - accountService.updateAccountClassification(companyId, accountNumber, accountClass, normalBalanceSide) - } - accountUpdateSequences.merge(accountUpdateSequenceKey(companyId, accountNumber), 1) { Integer oldValue, Integer newValue -> - oldValue + newValue - } - [ok: true, account: accountMap(updated)] - } catch (Exception exception) { - [ok: false, errors: [exception.message ?: exception.class.simpleName]] - } - } - - private static Map accountMap(Account account) { + @PackageScope + static Map accountMap(Account account) { [ id: account.id, account_number: account.accountNumber, @@ -477,7 +380,7 @@ class AccountingMcpTools { } private Map listAccountingInstructions(Map args) { - long companyId = requiredLong(args, 'company_id') + long companyId = McpArgs.requiredLong(args, 'company_id') [ ok: true, instructions: accountingInstructionService.list(companyId).collect { AccountingInstruction instruction -> @@ -499,8 +402,8 @@ class AccountingMcpTools { } private Map listVouchers(Map args) { - long companyId = requiredLong(args, 'company_id') - long fiscalYearId = requiredLong(args, 'fiscal_year_id') + long companyId = McpArgs.requiredLong(args, 'company_id') + long fiscalYearId = McpArgs.requiredLong(args, 'fiscal_year_id') long expectedCompanyId = companyService.resolveFromFiscalYear(fiscalYearId) if (expectedCompanyId != companyId) { return [ok: false, error: "Fiscal year ${fiscalYearId} does not belong to company ${companyId}."] @@ -533,8 +436,8 @@ class AccountingMcpTools { } private Map getTrialBalance(Map args) { - long companyId = requiredLong(args, 'company_id') - long fiscalYearId = requiredLong(args, 'fiscal_year_id') + long companyId = McpArgs.requiredLong(args, 'company_id') + long fiscalYearId = McpArgs.requiredLong(args, 'fiscal_year_id') Long periodId = optionalLong(args, 'accounting_period_id') LocalDate startDate = args.get('start_date') ? LocalDate.parse((String) args.get('start_date')) : null LocalDate endDate = args.get('end_date') ? LocalDate.parse((String) args.get('end_date')) : null @@ -563,8 +466,8 @@ class AccountingMcpTools { } private Map getGeneralLedger(Map args) { - long companyId = requiredLong(args, 'company_id') - long fiscalYearId = requiredLong(args, 'fiscal_year_id') + long companyId = McpArgs.requiredLong(args, 'company_id') + long fiscalYearId = McpArgs.requiredLong(args, 'fiscal_year_id') Long periodId = optionalLong(args, 'accounting_period_id') LocalDate startDate = args.get('start_date') ? LocalDate.parse((String) args.get('start_date')) : null LocalDate endDate = args.get('end_date') ? LocalDate.parse((String) args.get('end_date')) : null @@ -605,8 +508,8 @@ class AccountingMcpTools { } private Map listVatPeriods(Map args) { - long companyId = requiredLong(args, 'company_id') - long fiscalYearId = requiredLong(args, 'fiscal_year_id') + long companyId = McpArgs.requiredLong(args, 'company_id') + long fiscalYearId = McpArgs.requiredLong(args, 'fiscal_year_id') long expectedCompanyId = companyService.resolveFromFiscalYear(fiscalYearId) if (expectedCompanyId != companyId) { return [ok: false, error: "Fiscal year ${fiscalYearId} does not belong to company ${companyId}."] @@ -629,8 +532,8 @@ class AccountingMcpTools { } private Map getVatReport(Map args) { - long companyId = requiredLong(args, 'company_id') - long vatPeriodId = requiredLong(args, 'vat_period_id') + long companyId = McpArgs.requiredLong(args, 'company_id') + long vatPeriodId = McpArgs.requiredLong(args, 'vat_period_id') try { VatPeriod period = vatService.findPeriod(vatPeriodId) long expectedCompanyId = companyService.resolveFromFiscalYear(period.fiscalYearId) @@ -664,8 +567,8 @@ class AccountingMcpTools { } private Map bookVatTransfer(Map args) { - long companyId = requiredLong(args, 'company_id') - long vatPeriodId = requiredLong(args, 'vat_period_id') + long companyId = McpArgs.requiredLong(args, 'company_id') + long vatPeriodId = McpArgs.requiredLong(args, 'vat_period_id') String providedHash = args.get('report_hash') as String if (!providedHash) { return [ok: false, errors: ['report_hash krävs — kör get_vat_report först och skicka med det returnerade report_hash.']] @@ -712,11 +615,11 @@ class AccountingMcpTools { } private Map previewVoucher(Map args) { - long companyId = requiredLong(args, 'company_id') - long fiscalYearId = requiredLong(args, 'fiscal_year_id') - String seriesCode = requiredString(args, 'series_code') - String dateText = requiredString(args, 'accounting_date') - String description = requiredString(args, 'description') + long companyId = McpArgs.requiredLong(args, 'company_id') + long fiscalYearId = McpArgs.requiredLong(args, 'fiscal_year_id') + String seriesCode = McpArgs.requiredString(args, 'series_code') + String dateText = McpArgs.requiredString(args, 'accounting_date') + String description = McpArgs.requiredString(args, 'description') List> rawLines = linesArg(args) List errors = [] @@ -762,7 +665,7 @@ class AccountingMcpTools { } private Map createCorrectionVoucher(Map args) { - long originalVoucherId = requiredLong(args, 'original_voucher_id') + long originalVoucherId = McpArgs.requiredLong(args, 'original_voucher_id') String description = args.get('description') as String boolean force = optionalBoolean(args, 'force', false) try { @@ -794,8 +697,8 @@ class AccountingMcpTools { } private Map previewYearEnd(Map args) { - long companyId = requiredLong(args, 'company_id') - long fiscalYearId = requiredLong(args, 'fiscal_year_id') + long companyId = McpArgs.requiredLong(args, 'company_id') + long fiscalYearId = McpArgs.requiredLong(args, 'fiscal_year_id') String closingAccount = optionalString(args, 'closing_account', null) try { long expectedCompanyId = companyService.resolveFromFiscalYear(fiscalYearId) @@ -829,8 +732,8 @@ class AccountingMcpTools { } private Map closeFiscalYear(Map args) { - long companyId = requiredLong(args, 'company_id') - long fiscalYearId = requiredLong(args, 'fiscal_year_id') + long companyId = McpArgs.requiredLong(args, 'company_id') + long fiscalYearId = McpArgs.requiredLong(args, 'fiscal_year_id') String closingAccount = optionalString(args, 'closing_account', null) String providedToken = args.get('preview_token') as String if (!providedToken) { @@ -875,8 +778,8 @@ class AccountingMcpTools { } private Map lockFiscalYear(Map args) { - long companyId = requiredLong(args, 'company_id') - long fiscalYearId = requiredLong(args, 'fiscal_year_id') + long companyId = McpArgs.requiredLong(args, 'company_id') + long fiscalYearId = McpArgs.requiredLong(args, 'fiscal_year_id') String reason = optionalString(args, 'reason', null) try { long expectedCompanyId = companyService.resolveFromFiscalYear(fiscalYearId) @@ -898,8 +801,8 @@ class AccountingMcpTools { } private Map previewSieImport(Map args) { - long companyId = requiredLong(args, 'company_id') - Path filePath = Path.of(requiredString(args, 'file_path')) + long companyId = McpArgs.requiredLong(args, 'company_id') + Path filePath = Path.of(McpArgs.requiredString(args, 'file_path')) boolean replaceExisting = optionalBoolean(args, 'replace_existing', false) try { SieImportPreview preview = sieImportExportService.previewSieImport(companyId, filePath, replaceExisting) @@ -913,8 +816,8 @@ class AccountingMcpTools { } private Map importSie(Map args) { - long companyId = requiredLong(args, 'company_id') - Path filePath = Path.of(requiredString(args, 'file_path')) + long companyId = McpArgs.requiredLong(args, 'company_id') + Path filePath = Path.of(McpArgs.requiredString(args, 'file_path')) boolean replaceExisting = optionalBoolean(args, 'replace_existing', false) String providedToken = args.get('import_token') as String if (!providedToken) { @@ -966,7 +869,7 @@ class AccountingMcpTools { } private Map exportSie(Map args) { - long fiscalYearId = requiredLong(args, 'fiscal_year_id') + long fiscalYearId = McpArgs.requiredLong(args, 'fiscal_year_id') boolean overwrite = optionalBoolean(args, 'overwrite', false) try { Path outputPath = args.get('output_path') == null @@ -998,7 +901,7 @@ class AccountingMcpTools { } private Map listImportJobs(Map args) { - long companyId = requiredLong(args, 'company_id') + long companyId = McpArgs.requiredLong(args, 'company_id') int limit = Math.min(Math.max(optionalInt(args, 'limit', 20), 1), 50) try { [ @@ -1022,17 +925,6 @@ class AccountingMcpTools { // ---- helpers ---- - private static long requiredLong(Map args, String key) { - Object value = args.get(key) - if (value == null) { - throw new IllegalArgumentException("Missing required argument: ${key}") - } - if (!(value instanceof Number)) { - throw new IllegalArgumentException("Argument ${key} must be a number.") - } - ((Number) value).longValue() - } - private static Long optionalLong(Map args, String key) { Object value = args.get(key) if (value == null) { @@ -1055,14 +947,6 @@ class AccountingMcpTools { ((Number) value).intValue() } - private static String requiredString(Map args, String key) { - String value = args.get(key) as String - if (!value?.trim()) { - throw new IllegalArgumentException("Missing required argument: ${key}") - } - value.trim() - } - private static String optionalString(Map args, String key, String defaultValue) { String value = args.get(key) as String value?.trim() ?: defaultValue @@ -1105,40 +989,6 @@ class AccountingMcpTools { ]) } - private String accountUpdateToken( - long companyId, - String accountNumber, - String accountClass, - String normalBalanceSide, - Account currentState - ) { - computePreviewToken([ - company_id: companyId, - account_number: accountNumber, - account_class: accountClass, - normal_balance_side: normalBalanceSide, - // Bind the token to the account's current state so an outdated preview (changed - // elsewhere after previewing) no longer matches. The per-account write sequence makes - // the token strictly increasing: it is raised on every successful MCP account update, - // so even when the account returns to an earlier state (A->B->A->B) the token never - // repeats a consumed one - while writes to other accounts or unrelated audit entries - // do not invalidate it. - current_account_class: currentState?.accountClass, - current_normal_balance_side: currentState?.normalBalanceSide, - vat_code: currentState?.vatCode, - manual_review_required: currentState?.manualReviewRequired, - update_sequence: accountUpdateSequence(companyId, accountNumber) - ]) - } - - private int accountUpdateSequence(long companyId, String accountNumber) { - accountUpdateSequences.getOrDefault(accountUpdateSequenceKey(companyId, accountNumber), 0) - } - - private static String accountUpdateSequenceKey(long companyId, String accountNumber) { - "${companyId}:${accountNumber}" - } - private static String sieImportToken(long companyId, SieImportPreview preview) { computePreviewToken(sieImportTokenPayload(companyId, preview)) } diff --git a/app/src/main/groovy/se/alipsa/accounting/mcp/McpArgs.groovy b/app/src/main/groovy/se/alipsa/accounting/mcp/McpArgs.groovy new file mode 100644 index 0000000..c6a29ba --- /dev/null +++ b/app/src/main/groovy/se/alipsa/accounting/mcp/McpArgs.groovy @@ -0,0 +1,30 @@ +package se.alipsa.accounting.mcp + +/** + * Shared argument readers for MCP tool handlers. Centralised so every tool validates and + * trims its required arguments the same way. + */ +final class McpArgs { + + private McpArgs() { + } + + static long requiredLong(Map args, String key) { + Object value = args.get(key) + if (value == null) { + throw new IllegalArgumentException("Missing required argument: ${key}") + } + if (!(value instanceof Number)) { + throw new IllegalArgumentException("Argument ${key} must be a number.") + } + ((Number) value).longValue() + } + + static String requiredString(Map args, String key) { + String value = args.get(key) as String + if (!value?.trim()) { + throw new IllegalArgumentException("Missing required argument: ${key}") + } + value.trim() + } +} diff --git a/app/src/main/groovy/se/alipsa/accounting/mcp/McpToolDefinitions.groovy b/app/src/main/groovy/se/alipsa/accounting/mcp/McpToolDefinitions.groovy index 794c7cc..865fa4c 100644 --- a/app/src/main/groovy/se/alipsa/accounting/mcp/McpToolDefinitions.groovy +++ b/app/src/main/groovy/se/alipsa/accounting/mcp/McpToolDefinitions.groovy @@ -62,7 +62,7 @@ final class McpToolDefinitions { ] ), toolDef('preview_account_update', - 'Previews a classification change (account_class and/or normal_balance_side) for one account without writing anything. Account class and side are case-insensitive. Returns the current account, the proposed values, how many posted vouchers/lines and fiscal years reference the account, and any VAT-code compatibility problem. Returns a preview_token when the change is applicable; when the account already has exactly these values (and no manual review flag), ok is true, unchanged is true and no token is returned. Use it to clear accounts flagged manual_review_required, e.g. after a SIE import of BAS class 8 accounts. Apply with update_account.', + 'Previews a classification change (account_class and/or normal_balance_side) for one account without writing anything. Account class and side are case-insensitive. Returns the current account, the proposed values, how many posted vouchers/lines and fiscal years reference the account, and any VAT-code compatibility problem. When some of those fiscal years are closed, a warning says how many, since reclassification restates their reports after the fact; the count covers posted vouchers only, so an account with opening balances but no vouchers in a closed year is not counted. A side change on an account with stored opening balances also warns, because flipping the normal balance side inverts the sign of those stored balances in every fiscal year. Returns a preview_token when the change is applicable; when the account already has exactly these values (and no manual review flag), ok is true, unchanged is true and no token is returned. Use it to clear accounts flagged manual_review_required, e.g. after a SIE import of BAS class 8 accounts. Apply with update_account.', ['company_id', 'account_number', 'account_class', 'normal_balance_side'], [ company_id: intParam('Company ID'), diff --git a/app/src/main/groovy/se/alipsa/accounting/service/AccountService.groovy b/app/src/main/groovy/se/alipsa/accounting/service/AccountService.groovy index 4a90ebe..590a213 100644 --- a/app/src/main/groovy/se/alipsa/accounting/service/AccountService.groovy +++ b/app/src/main/groovy/se/alipsa/accounting/service/AccountService.groovy @@ -364,8 +364,11 @@ final class AccountService { /** * How much posted data references the account: distinct posted vouchers, voucher lines and - * fiscal years. Used by the MCP account-update preview to show the blast radius of a - * classification change. + * fiscal years, including how many of those fiscal years are closed, plus how many fiscal + * years have an opening balance stored for the account. Used by the MCP account-update + * preview to show the blast radius of a classification change; closed years matter because + * reclassification restates their reports after the fact, and stored opening balances change + * sign interpretation when the normal balance side flips. */ AccountUsageSummary summarizeAccountUsage(long companyId, String accountNumber) { CompanyService.requireValidCompanyId(companyId) @@ -375,16 +378,26 @@ final class AccountService { GroovyRowResult row = sql.firstRow(''' select count(distinct v.id) as voucherCount, count(*) as lineCount, - count(distinct v.fiscal_year_id) as fiscalYearCount + count(distinct v.fiscal_year_id) as fiscalYearCount, + count(distinct case when fy.closed then v.fiscal_year_id end) as closedFiscalYearCount from voucher_line vl join voucher v on v.id = vl.voucher_id + join fiscal_year fy on fy.id = v.fiscal_year_id where vl.account_id = ? and v.status in ('ACTIVE', 'CORRECTION') ''', [account.id]) as GroovyRowResult + GroovyRowResult openingRow = sql.firstRow(''' + select count(distinct fiscal_year_id) as openingBalanceYearCount + from opening_balance + where account_id = ? + and amount <> 0 + ''', [account.id]) as GroovyRowResult new AccountUsageSummary( ((Number) row.get('voucherCount')).intValue(), ((Number) row.get('lineCount')).intValue(), - ((Number) row.get('fiscalYearCount')).intValue() + ((Number) row.get('fiscalYearCount')).intValue(), + ((Number) row.get('closedFiscalYearCount')).intValue(), + ((Number) openingRow.get('openingBalanceYearCount')).intValue() ) } } @@ -978,5 +991,7 @@ final class AccountService { int voucherCount int voucherLineCount int fiscalYearCount + int closedFiscalYearCount + int openingBalanceYearCount } } diff --git a/app/src/test/groovy/integration/se/alipsa/accounting/mcp/AccountClassificationMcpToolsTest.groovy b/app/src/test/groovy/integration/se/alipsa/accounting/mcp/AccountClassificationMcpToolsTest.groovy index 76c7a14..db1f1ca 100644 --- a/app/src/test/groovy/integration/se/alipsa/accounting/mcp/AccountClassificationMcpToolsTest.groovy +++ b/app/src/test/groovy/integration/se/alipsa/accounting/mcp/AccountClassificationMcpToolsTest.groovy @@ -148,9 +148,104 @@ class AccountClassificationMcpToolsTest { assertEquals(1, usage.get('voucher_count')) assertEquals(1, usage.get('voucher_line_count')) assertEquals(1, usage.get('fiscal_year_count')) + assertEquals(0, usage.get('closed_fiscal_year_count')) + assertTrue(((List) result.get('warnings')).isEmpty()) assertNotNull(result.get('preview_token')) } + @Test + void previewAccountUpdateWarnsWhenAccountIsUsedInClosedFiscalYears() { + postVoucherTouching8314() + new FiscalYearService(databaseService).lockFiscalYear(fiscalYearId, 'Teststängning') + + Map result = tools.callTool('preview_account_update', [ + company_id: (Object) 1L, + account_number: (Object) '8314', + account_class: (Object) 'INCOME', + normal_balance_side: (Object) 'CREDIT' + ]) + + assertTrue((boolean) result.get('ok'), "Expected ok but got: ${result.get('errors')}") + Map usage = (Map) result.get('usage') + assertEquals(1, usage.get('fiscal_year_count')) + assertEquals(1, usage.get('closed_fiscal_year_count')) + List warnings = (List) result.get('warnings') + assertTrue(warnings.any { String warning -> warning.contains('1 stängt räkenskapsår') }) + assertNotNull(result.get('preview_token')) + } + + @Test + void previewAccountUpdateWarnsWhenSideFlipWouldInvertStoredOpeningBalances() { + insertOpeningBalance(fiscalYearId, '1930', 500.00G) + + Map result = tools.callTool('preview_account_update', [ + company_id: (Object) 1L, + account_number: (Object) '1930', + account_class: (Object) 'ASSET', + normal_balance_side: (Object) 'CREDIT' + ]) + + assertTrue((boolean) result.get('ok'), "Expected ok but got: ${result.get('errors')}") + Map usage = (Map) result.get('usage') + assertEquals(1, usage.get('opening_balance_year_count')) + List warnings = (List) result.get('warnings') + assertTrue(warnings.any { String warning -> warning.contains('vänder tecknet') }) + assertNotNull(result.get('preview_token')) + } + + @Test + void previewAccountUpdateDoesNotWarnWhenSidelessAccountGetsDebit() { + // A missing side is read as DEBIT everywhere, so null -> DEBIT is not a sign change even + // though the stored value differs from the proposed one. + insertOpeningBalance(fiscalYearId, '8314', 100.00G) + + Map result = tools.callTool('preview_account_update', [ + company_id: (Object) 1L, + account_number: (Object) '8314', + account_class: (Object) 'INCOME', + normal_balance_side: (Object) 'DEBIT' + ]) + + assertTrue((boolean) result.get('ok'), "Expected ok but got: ${result.get('errors')}") + Map usage = (Map) result.get('usage') + assertEquals(1, usage.get('opening_balance_year_count')) + List warnings = (List) result.get('warnings') + assertFalse(warnings.any { String warning -> warning.contains('vänder tecknet') }) + } + + @Test + void previewAccountUpdateDoesNotWarnForZeroAmountOpeningBalances() { + insertOpeningBalance(fiscalYearId, '1930', 0.00G) + + Map result = tools.callTool('preview_account_update', [ + company_id: (Object) 1L, + account_number: (Object) '1930', + account_class: (Object) 'ASSET', + normal_balance_side: (Object) 'CREDIT' + ]) + + assertTrue((boolean) result.get('ok'), "Expected ok but got: ${result.get('errors')}") + Map usage = (Map) result.get('usage') + assertEquals(0, usage.get('opening_balance_year_count')) + List warnings = (List) result.get('warnings') + assertFalse(warnings.any { String warning -> warning.contains('vänder tecknet') }) + } + + @Test + void previewAccountUpdateRejectsUnknownNormalBalanceSide() { + Map result = tools.callTool('preview_account_update', [ + company_id: (Object) 1L, + account_number: (Object) '8314', + account_class: (Object) 'INCOME', + normal_balance_side: (Object) 'BOGUS' + ]) + + assertFalse((boolean) result.get('ok')) + List errors = (List) result.get('errors') + assertTrue(errors.any { String error -> error.contains('BOGUS') }) + assertEquals([], result.get('warnings')) + } + @Test void updateAccountAppliesPreviewedChangeClearsManualReviewAndWritesAudit() { Map preview = tools.callTool('preview_account_update', [ @@ -260,6 +355,7 @@ class AccountClassificationMcpToolsTest { assertFalse((boolean) result.get('ok')) List errors = (List) result.get('errors') assertTrue(errors.any { String error -> error.contains('Okänt kontonummer') }) + assertEquals([], result.get('warnings')) assertNull(result.get('preview_token')) } @@ -275,6 +371,7 @@ class AccountClassificationMcpToolsTest { assertFalse((boolean) result.get('ok')) List errors = (List) result.get('errors') assertTrue(errors.any { String error -> error.contains('NOT_A_CLASS') }) + assertEquals([], result.get('warnings')) } @Test @@ -587,6 +684,15 @@ class AccountClassificationMcpToolsTest { ) } + private void insertOpeningBalance(long yearId, String accountNumber, BigDecimal amount) { + databaseService.withTransaction { Sql sql -> + sql.executeInsert(''' + insert into opening_balance (fiscal_year_id, account_id, amount, created_at, updated_at) + values (?, ?, ?, current_timestamp, current_timestamp) + ''', [yearId, accountId(accountNumber), amount]) + } + } + private long accountId(String accountNumber) { databaseService.withSql { Sql sql -> GroovyRowResult row = sql.firstRow( diff --git a/app/src/test/groovy/integration/se/alipsa/accounting/service/AccountServiceTest.groovy b/app/src/test/groovy/integration/se/alipsa/accounting/service/AccountServiceTest.groovy index 9562e92..6b9e5a7 100644 --- a/app/src/test/groovy/integration/se/alipsa/accounting/service/AccountServiceTest.groovy +++ b/app/src/test/groovy/integration/se/alipsa/accounting/service/AccountServiceTest.groovy @@ -11,10 +11,13 @@ import org.junit.jupiter.api.io.TempDir import se.alipsa.accounting.domain.Account import se.alipsa.accounting.domain.AuditLogEntry +import se.alipsa.accounting.domain.FiscalYear import se.alipsa.accounting.domain.VatCode +import se.alipsa.accounting.domain.VoucherLine import se.alipsa.accounting.support.AppPaths import java.nio.file.Path +import java.time.LocalDate class AccountServiceTest { @@ -363,6 +366,31 @@ class AccountServiceTest { assertEquals(0, usage.voucherCount) assertEquals(0, usage.voucherLineCount) assertEquals(0, usage.fiscalYearCount) + assertEquals(0, usage.closedFiscalYearCount) + assertEquals(0, usage.openingBalanceYearCount) + } + + @Test + void summarizeAccountUsageCountsOnlyClosedFiscalYears() { + FiscalYearService fiscalYearService = new FiscalYearService(databaseService) + VoucherService voucherService = new VoucherService(databaseService) + FiscalYear closedYear = fiscalYearService.createFiscalYear( + CompanyService.LEGACY_COMPANY_ID, '2025', LocalDate.of(2025, 1, 1), LocalDate.of(2025, 12, 31)) + FiscalYear openYear = fiscalYearService.createFiscalYear( + CompanyService.LEGACY_COMPANY_ID, '2026', LocalDate.of(2026, 1, 1), LocalDate.of(2026, 12, 31)) + postVoucherTouching3010(voucherService, closedYear.id, LocalDate.of(2025, 3, 1)) + postVoucherTouching3010(voucherService, openYear.id, LocalDate.of(2026, 3, 1)) + insertOpeningBalance(openYear.id, '3010', 100.00G) + fiscalYearService.lockFiscalYear(closedYear.id, 'Teststängning') + + AccountService.AccountUsageSummary usage = accountService.summarizeAccountUsage( + CompanyService.LEGACY_COMPANY_ID, '3010') + + assertEquals(2, usage.voucherCount) + assertEquals(2, usage.voucherLineCount) + assertEquals(2, usage.fiscalYearCount) + assertEquals(1, usage.closedFiscalYearCount) + assertEquals(1, usage.openingBalanceYearCount) } @Test @@ -528,6 +556,31 @@ class AccountServiceTest { assertTrue(AccountService.compatibleVatCodes(equity).isEmpty()) } + private void insertOpeningBalance(long fiscalYearId, String accountNumber, BigDecimal amount) { + databaseService.withTransaction { Sql sql -> + long accountId = ((Number) sql.firstRow( + 'select id from account where company_id = ? and account_number = ?', + [CompanyService.LEGACY_COMPANY_ID, accountNumber]).get('id')).longValue() + sql.executeInsert(''' + insert into opening_balance (fiscal_year_id, account_id, amount, created_at, updated_at) + values (?, ?, ?, current_timestamp, current_timestamp) + ''', [fiscalYearId, accountId, amount]) + } + } + + private void postVoucherTouching3010(VoucherService voucherService, long yearId, LocalDate voucherDate) { + voucherService.createVoucher( + yearId, + 'A', + voucherDate, + 'Försäljning', + [ + new VoucherLine(null, null, 0, null, '1510', null, 'Kundfordran', 100.00G, 0.00G), + new VoucherLine(null, null, 1, null, '3010', null, 'Försäljning', 0.00G, 100.00G) + ] + ) + } + private void insertTestAccounts() { databaseService.withTransaction { Sql sql -> sql.executeInsert(''' diff --git a/release.md b/release.md index cab5bf6..ba46ffd 100644 --- a/release.md +++ b/release.md @@ -2,6 +2,25 @@ ## v1.9.0, unreleased +### Förbättringar + +- **Årsbokslutet nollställer inte längre resultatkontona** — Vid årsbokslut behålls intäkts- och kostnadskontonas saldon, och endast årets resultat förs över via konto 8999 mot det egna-kapitalkonto som väljs i dialogen. SIE-exporten innehåller nu även `#RES`-poster för årets resultat. (#130) +- **Förvalt resultatkonto följer bolagsformen** — 2099 för aktiebolag, 2019 för enskild firma, handelsbolag och kommanditbolag. Företag utan angiven bolagsform faller tillbaka på aktiebolagets 2099. +- **Låsa räkenskapsår via AI-assistenten** — Nytt MCP-verktyg `lock_fiscal_year` med valfri anledning som sparas i auditloggen. Nästa räkenskapsår planeras korrekt även efter ett förkortat första räkenskapsår, och 8xxx-konton klassificeras automatiskt vid behov (8999 som kostnad med debet som normalsida). (#119) +- **Ändra konton via AI-assistenten** — Nya MCP-verktyg `preview_account_update` och `update_account`. `list_accounts` kan filtrera på oklassificerade konton och konton som kräver granskning. Kontoändringar skrivs till auditloggen (UPDATE_ACCOUNT). Förhandsgranskningen varnar när kontot har bokföring i stängda räkenskapsår, eftersom omklassificering då ändrar rapporterna för dessa år i efterhand. (#120) +- **Tydligare kontoredigering** — Kontodialogen kräver nu kontoklass och normalsida, och momskoden behålls när kontoklassen ändras. +- **Granskningsfilter i kontoplanen** — Filtrering på konton som kräver granskning har flyttats till en egen kryssruta. (#122) +- **SVG-ikoner** — Navigeringssidomenyn och verifikationsverktygsraden använder nu skalbara SVG-ikoner i stället för handritade bitmapper. (#125) +- **Datumfältet kollapsar inte längre** — Datumväljaren i verifikationspanelen behåller sin bredd även i smala fönster. (#124) +- **AI-assistenten skriver inte över osparat innehåll** — MCP-verktygen som fyller i en verifikation kräver nu `replace_unsaved: true` för att ersätta innehåll som användaren redan matat in. Nya fält `has_unsaved_changes` och `error_code` visar läget. (#126) + +### Viktigt att veta vid uppgraderingen + +- **Brytande MCP-ändring** — Fältet `result_account_count` har tagits bort från `preview_year_end` och `close_fiscal_year` och ersatts med `result_accounts_with_balance_count`. Nya fält `transferred_result` och `remaining_result` tillkommer. Externa MCP-klienter eller promptar som läser det gamla fältet måste uppdateras. +- **Redan stängda räkenskapsår ändras inte** — År som stängts med v1.8.0 eller tidigare har fortfarande sina intäkts- och kostnadskonton nollställda, och gamla resultaträkningar ändras inte av uppgraderingen. Korrigering av tidigare stängda år kräver ett separat arbetsflöde med granskade korrigeringsverifikationer. +- **Ange bolagsform före årsbokslutet** — Eftersom det förvalda resultatkontot följer bolagsformen bör bolagsformen vara satt i företagsinställningarna innan årsbokslutet görs. Ett företag utan bolagsform får 2099 (aktiebolag) som förval, vilket kan bli fel för en enskild firma eller ett handelsbolag. +- **Handelsbolag/kommanditbolag: fördela resultatet manuellt** — För HB/KB bokförs hela årets resultat på delägare 1:s konto 2019 och måste fördelas för hand mellan delägarna, till respektive delägares resultat- eller kapital-konto, enligt användarmanualen. + ### Underhåll - Uppdaterade beroenden: diff --git a/skill/accounting-mcp.md b/skill/accounting-mcp.md index bd85238..bbe1621 100644 --- a/skill/accounting-mcp.md +++ b/skill/accounting-mcp.md @@ -32,7 +32,7 @@ Always read before you write. Gather context first, propose actions, then place | `get_active_voucher_draft` | Read the unsaved voucher draft currently shown in the desktop application | | `preview_year_end` | Year-end pre-checks: blocking issues, warnings, net result; returns `preview_token` only when ready | | `preview_sie_import` | Preview a SIE4 import; returns `import_token` only when importable | -| `preview_account_update` | Preview a classification change (`account_class`/`normal_balance_side`) for one account: current vs proposed values, affected voucher/line/fiscal-year counts, VAT-code compatibility, and a `preview_token` | +| `preview_account_update` | Preview a classification change (`account_class`/`normal_balance_side`) for one account: current vs proposed values, affected voucher/line/fiscal-year counts, a warning when the account is used in closed fiscal years, VAT-code compatibility, and a `preview_token` | | `list_import_jobs` | Recent SIE import history | ### Write tools @@ -130,7 +130,13 @@ Only call write tools after the user explicitly confirms the proposed action. subgroup: 80-83 income, 84-89 expense; 8999 Årets resultat is EXPENSE/DEBIT) and the account's actual usage in `get_general_ledger`. Call `preview_account_update` with the proposed `account_class` and `normal_balance_side` and show the current vs proposed values, the affected - voucher/line/fiscal-year counts, and any VAT-code compatibility error. If it returns + voucher/line/fiscal-year counts, any VAT-code compatibility error, and any closed-fiscal-year + warning (`closed_fiscal_year_count` in `usage`): reclassifying an account used in closed years + changes the reports for those years after the fact, so surface that to the user before + confirming. The count covers posted vouchers only — an account with opening balances but no + vouchers in a closed year is not counted. A side change on an account with stored opening + balances also triggers a warning, because flipping `normal_balance_side` inverts the sign of + those stored balances in every fiscal year, open and closed alike. If it returns `unchanged: true` with no `preview_token`, the account already has these values — tell the user instead of calling `update_account`. 3. Ask the user to confirm the proposed classification.