@slothmoney/agent-cli 0.9.1 → 0.11.0

package/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Changelog
 
-## Unreleased
+## 0.11.0 - 2026-08-16
+
+- Add preview-by-default `budget move` for atomically moving current assigned
+  money between categories or To Assign without changing planned budgets.
+- Accept human-readable currency amounts at the CLI boundary, send integer
+  pence to the Agent API, and validate the returned affected balances.
+
+## 0.10.0 - 2026-08-15
+
+- Require every goal create to specify a positive target amount and Keep or
+  Spend type, matching the breaking Agent Goals API v1 contract.
+- Expose `goalType` and nullable `spentAt`, allow active goal type changes, and
+  remove obsolete `isAchieved` and target-amount clearing assumptions.
+- Add preview-by-default `goals mark-spent` and `goals restore` actions that
+  send the canonical `isSpent` lifecycle update only with `--apply`.
 
 ## 0.9.1 - 2026-08-15
 

package/README.md

@@ -1,6 +1,6 @@
 # Sloth Agent CLI
 
-Use your own agent to inspect accounts, investments, and budgets, manage goals, update planned amounts, and categorise transactions through the
+Use your own agent to inspect accounts, investments, and budgets, manage goals, move assigned budget money, update planned amounts, and categorise transactions through the
 [Sloth Money Agent API](https://slothmoney.app/developers/).
 
 ## Install
@@ -15,7 +15,7 @@ sloth-agent --version
 For a one-off pinned run:
 
 ```bash
-npm exec --yes --package=@slothmoney/agent-cli@0.9.1 -- sloth-agent --help
+npm exec --yes --package=@slothmoney/agent-cli@0.11.0 -- sloth-agent --help
 ```
 
 ## Authenticate
@@ -27,7 +27,7 @@ where the CLI runs.
 New tokens are view-only. That is enough for `auth status`, `accounts`, `investments`,
 `budget`, `categories`, `transactions`, and `goals` list. Enable **Allow changes** when
 creating the token only if the CLI must apply assignments, manage categories
-or line items, update planned budgets, manage accounts, ask a partner for an explanation, or manage goals. Token
+or line items, move assigned budget money, update planned budgets, manage accounts, ask a partner for an explanation, or manage goals. Token
 permissions cannot be changed later - revoke and reissue the token instead.
 
 ### Local computer
@@ -105,6 +105,7 @@ sloth-agent auth login --help
 sloth-agent accounts --help
 sloth-agent budget --help
 sloth-agent budget update --help
+sloth-agent budget move --help
 sloth-agent categories --help
 sloth-agent categories create --help
 sloth-agent line-items create --help
@@ -112,6 +113,8 @@ sloth-agent transactions --help
 sloth-agent assign --help
 sloth-agent goals create --help
 sloth-agent goals update --help
+sloth-agent goals mark-spent --help
+sloth-agent goals restore --help
 sloth-agent ask-partner --help
 ```
 
@@ -283,6 +286,37 @@ period and everything after it. Earlier and historical periods remain unchanged.
 Without `--apply`, the CLI validates the file locally and does not load a token
 or contact Sloth Money. Applying requires a write-enabled token.
 
+Move current assigned money between two categories, or use the reserved
+`to-assign` ID to move money to or from To Assign:
+
+```bash
+sloth-agent budget move \
+  --scope personal \
+  --from-category-id activities \
+  --to-category-id groceries \
+  --amount 52.95
+
+sloth-agent budget move \
+  --scope personal \
+  --from-category-id activities \
+  --to-category-id groceries \
+  --amount 52.95 \
+  --apply
+```
+
+Copy category IDs from `sloth-agent budget` output. `--amount` is expressed in
+the budget currency and accepts up to two decimal places; the CLI converts the
+decimal digits exactly and sends a positive safe-integer number of pence to the
+API. Without `--apply`, the command validates and prints the exact request
+without loading credentials or contacting Sloth Money.
+
+Applying subtracts and adds the amount atomically, records the movement in the
+budget history, and returns the affected assigned balances. It does not change
+planned line-item amounts or future budget plans. Like the UI, it permits a
+source category or To Assign to become negative; an automated workflow should
+choose donors from its own available-balance policy. Historical periods cannot
+be changed, and applying requires a write-enabled token.
+
 Create or rename a custom category. Writes are previews until `--apply` is
 present:
 
@@ -413,45 +447,64 @@ Goal writes are previews unless `--apply` is present:
 sloth-agent goals create \
   --name "Emergency fund" \
   --target-amount 12000 \
-  --target-month 2027-06
+  --type keep
 
 sloth-agent goals create \
-  --name "Emergency fund" \
-  --target-amount 12000 \
+  --name "Wedding" \
+  --target-amount 22000 \
   --target-month 2027-06 \
+  --type spend \
   --apply
 ```
 
-Use the `id` from list or create output to update or delete goals:
+Every goal is either Keep or Spend. A Keep goal continues reserving its funded
+money. A Spend goal reserves money until you explicitly mark it spent. Goal
+list, create, and update output includes lowercase `goalType` and nullable
+`spentAt`; `spentAt` is an ISO timestamp only after a Spend goal is marked
+spent.
+
+Use the `id` from list or create output to update a goal, change its type, or
+move it in the priority order:
 
 ```bash
 sloth-agent goals update \
   --goal-id goal-id \
-  --clear-target-amount \
   --target-month 2027-12 \
-  --achieved=false \
+  --type spend \
   --apply
 
 sloth-agent goals update \
   --goal-id house-goal-id \
   --priority 2 \
   --apply
+```
+
+Marking spent and restoring are also previews by default:
+
+```bash
+sloth-agent goals mark-spent --goal-id goal-id
+sloth-agent goals mark-spent --goal-id goal-id --apply
+
+sloth-agent goals restore --goal-id goal-id
+sloth-agent goals restore --goal-id goal-id --apply
 
 sloth-agent goals delete --goal-id goal-id --apply
 ```
 
-Updates are partial. Use `--clear-target-amount` or `--clear-target-month` to
-remove an optional value. Marking a goal achieved removes its forecast
-assignment. Deleting a goal also removes its forecast assignments and drift
-history. Goal sharing remains app-managed. Change an active shared goal's
-pot-tracked target amount in the Sloth Budget app, where account balances can
-be reallocated across goals in priority order. Goal list output includes a
+Updates are partial. Use `--clear-target-month` to remove the optional month.
+A Keep goal cannot be marked spent. A spent goal must be restored before its
+type can change; the API returns these lifecycle conflicts without hiding the
+required recovery action. Restoring clears `spentAt` and returns the goal to
+allocation at its saved priority. Deleting a goal also removes its forecast
+assignments and drift history.
+
+Goal sharing remains app-managed. Change an active shared goal's pot-tracked
+target amount in the Sloth Budget app, where account balances can be
+reallocated across goals in priority order. Goal list output includes a
 one-based `priority`; `1` is highest. Moving one goal automatically shifts the
-goals between its old and new positions. The
-priority option must be used on its own, and the write persists immediately.
-Forecast assignments and shared pot
-progress are browser-owned derived state and refresh when the owner next opens
-the Forecast screen.
+goals between its old and new positions. The priority option must be used on
+its own. Forecast assignments and shared pot progress are browser-owned
+derived state and refresh when the owner next opens the Forecast screen.
 
 Read uncategorised contributions to the joint budget:
 

package/dist/args.js

@@ -1,5 +1,6 @@
 import { UsageError } from './errors.js';
 import { CATEGORY_TYPES, ICON_KEYS, } from './category-metadata.js';
+import { isGoalType, } from './goal-metadata.js';
 const PRODUCTION_BASE_URL = 'https://budget.slothmoney.app';
 const LOCAL_HOSTS = new Set(['localhost', '127.0.0.1', '[::1]']);
 function readOptionValue(args, index, name) {
@@ -48,16 +49,33 @@ function requireNonEmpty(value, name) {
         throw new UsageError(`${name} requires a value`);
     return value;
 }
-function parseGoalAmount(value, name) {
+function validatePositiveDecimalAmount(value, name) {
     if (!/^\d+(?:\.\d{1,2})?$/.test(value)) {
         throw new UsageError(`${name} must be a positive amount with at most two decimal places`);
     }
+    const digits = value.replace('.', '');
+    if (!/[1-9]/.test(digits)) {
+        throw new UsageError(`${name} must be a positive amount with at most two decimal places`);
+    }
+}
+function parsePositiveDecimalAmount(value, name) {
+    validatePositiveDecimalAmount(value, name);
     const amount = Number(value);
     if (!Number.isFinite(amount) || amount <= 0) {
         throw new UsageError(`${name} must be a positive amount with at most two decimal places`);
     }
     return amount;
 }
+function parsePositiveAmountPence(value, name) {
+    validatePositiveDecimalAmount(value, name);
+    const [wholePounds, fractionalPounds = ''] = value.split('.');
+    const amountPence = BigInt(wholePounds) * 100n
+        + BigInt(fractionalPounds.padEnd(2, '0'));
+    if (amountPence > BigInt(Number.MAX_SAFE_INTEGER)) {
+        throw new UsageError(`${name} must be a positive amount with at most two decimal places`);
+    }
+    return Number(amountPence);
+}
 function parseGoalMonthKey(value, name) {
     if (!/^\d{4}-(0[1-9]|1[0-2])$/.test(value)) {
         throw new UsageError(`${name} must be a valid YYYY-MM month`);
@@ -74,11 +92,11 @@ function parseGoalPriority(value) {
     }
     return priority;
 }
-function parseExplicitBoolean(value, name) {
-    if (value !== 'true' && value !== 'false') {
-        throw new UsageError(`${name} must be true or false`);
+function parseGoalType(value) {
+    if (!isGoalType(value)) {
+        throw new UsageError('--type must be keep or spend');
     }
-    return value === 'true';
+    return value;
 }
 function parseGoalName(value) {
     const name = value.trim();
@@ -108,7 +126,7 @@ function parseResourceId(value, option) {
             const codePoint = character.codePointAt(0);
             return codePoint !== undefined && (codePoint < 32 || codePoint === 127);
         })) {
-        const resource = option === '--category-id' ? 'category' : 'line-item';
+        const resource = option === '--line-item-id' ? 'line-item' : 'category';
         throw new UsageError(`${option} must be a valid ${resource} document ID`);
     }
     return id;
@@ -354,13 +372,18 @@ function parseInvestments(args, baseUrl) {
     return withBaseUrl({ command: 'investments', ...(accountRef ? { accountRef } : {}) }, baseUrl);
 }
 function parseBudget(args, baseUrl) {
-    const update = args[0] === 'update';
-    if (update)
-        args.shift();
-    const { values, apply } = parseNamedOptions(args, update ? 'budget update' : 'budget', new Set(update ? ['--scope', '--period', '--input'] : ['--scope', '--period']));
-    if (!update && apply)
+    const subcommand = args[0] === 'update' || args[0] === 'move' ? args.shift() : undefined;
+    const update = subcommand === 'update';
+    const move = subcommand === 'move';
+    const commandLabel = update ? 'budget update' : move ? 'budget move' : 'budget';
+    const { values, apply } = parseNamedOptions(args, commandLabel, new Set(update
+        ? ['--scope', '--period', '--input']
+        : move
+            ? ['--scope', '--period', '--from-category-id', '--to-category-id', '--amount']
+            : ['--scope', '--period']));
+    if (!update && !move && apply)
         throw new UsageError('Unknown budget option: --apply');
-    const scope = requiredOption(values, '--scope', update ? 'budget update' : 'budget');
+    const scope = requiredOption(values, '--scope', commandLabel);
     if (scope !== 'personal' && scope !== 'joint') {
         throw new UsageError('--scope must be personal or joint');
     }
@@ -369,8 +392,23 @@ function parseBudget(args, baseUrl) {
         scope: scope,
         ...(period === undefined ? {} : { periodKey: parseGoalMonthKey(period, '--period') }),
     };
-    if (!update)
+    if (!update && !move)
         return withBaseUrl({ command: 'budget', ...common }, baseUrl);
+    if (move) {
+        const fromCategoryId = parseResourceId(requiredOption(values, '--from-category-id', commandLabel), '--from-category-id');
+        const toCategoryId = parseResourceId(requiredOption(values, '--to-category-id', commandLabel), '--to-category-id');
+        if (fromCategoryId === toCategoryId) {
+            throw new UsageError('--from-category-id and --to-category-id must differ');
+        }
+        return withBaseUrl({
+            command: 'budget-move',
+            ...common,
+            fromCategoryId,
+            toCategoryId,
+            amountPence: parsePositiveAmountPence(requiredOption(values, '--amount', commandLabel), '--amount'),
+            apply,
+        }, baseUrl);
+    }
     return withBaseUrl({
         command: 'budget-update',
         ...common,
@@ -500,6 +538,7 @@ function parseGoals(args, baseUrl) {
         let name;
         let targetAmount;
         let targetMonthKey;
+        let goalType;
         let apply = false;
         for (let index = 0; index < args.length; index += 1) {
             const argument = args[index];
@@ -514,7 +553,8 @@ function parseGoals(args, baseUrl) {
                 : [argument, undefined];
             if (option !== '--name'
                 && option !== '--target-amount'
-                && option !== '--target-month') {
+                && option !== '--target-month'
+                && option !== '--type') {
                 throw new UsageError(`Unknown goals create option: ${argument}`);
             }
             const value = requireNonEmpty(inlineValue ?? readOptionValue(args, index, option), option);
@@ -524,19 +564,29 @@ function parseGoals(args, baseUrl) {
                 name = setOnce(name, parseGoalName(value), option);
             }
             else if (option === '--target-amount') {
-                targetAmount = setOnce(targetAmount, parseGoalAmount(value, option), option);
+                targetAmount = setOnce(targetAmount, parsePositiveDecimalAmount(value, option), option);
             }
-            else {
+            else if (option === '--target-month') {
                 targetMonthKey = setOnce(targetMonthKey, parseGoalMonthKey(value, option), option);
             }
+            else {
+                goalType = setOnce(goalType, parseGoalType(value), option);
+            }
         }
         if (!name)
             throw new UsageError('goals create requires --name <name>');
+        if (targetAmount === undefined) {
+            throw new UsageError('goals create requires --target-amount <amount>');
+        }
+        if (goalType === undefined) {
+            throw new UsageError('goals create requires --type <keep|spend>');
+        }
         return withBaseUrl({
             command: 'goals-create',
             name,
-            ...(targetAmount === undefined ? {} : { targetAmount }),
+            targetAmount,
             ...(targetMonthKey === undefined ? {} : { targetMonthKey }),
+            goalType,
             apply,
         }, baseUrl);
     }
@@ -545,7 +595,7 @@ function parseGoals(args, baseUrl) {
         let name;
         let targetAmount;
         let targetMonthKey;
-        let isAchieved;
+        let goalType;
         let priority;
         let apply = false;
         for (let index = 0; index < args.length; index += 1) {
@@ -556,13 +606,6 @@ function parseGoals(args, baseUrl) {
                 apply = true;
                 continue;
             }
-            if (argument === '--clear-target-amount') {
-                if (targetAmount !== undefined) {
-                    throw new UsageError('--target-amount and --clear-target-amount are mutually exclusive');
-                }
-                targetAmount = null;
-                continue;
-            }
             if (argument === '--clear-target-month') {
                 if (targetMonthKey !== undefined) {
                     throw new UsageError('--target-month and --clear-target-month are mutually exclusive');
@@ -577,7 +620,7 @@ function parseGoals(args, baseUrl) {
                 && option !== '--name'
                 && option !== '--target-amount'
                 && option !== '--target-month'
-                && option !== '--achieved'
+                && option !== '--type'
                 && option !== '--priority') {
                 throw new UsageError(`Unknown goals update option: ${argument}`);
             }
@@ -591,10 +634,7 @@ function parseGoals(args, baseUrl) {
                 name = setOnce(name, parseGoalName(value), option);
             }
             else if (option === '--target-amount') {
-                if (targetAmount !== undefined) {
-                    throw new UsageError('--target-amount and --clear-target-amount are mutually exclusive');
-                }
-                targetAmount = parseGoalAmount(value, option);
+                targetAmount = setOnce(targetAmount, parsePositiveDecimalAmount(value, option), option);
             }
             else if (option === '--target-month') {
                 if (targetMonthKey !== undefined) {
@@ -606,7 +646,7 @@ function parseGoals(args, baseUrl) {
                 priority = setOnce(priority, parseGoalPriority(value), option);
             }
             else {
-                isAchieved = setOnce(isAchieved, parseExplicitBoolean(value, option), option);
+                goalType = setOnce(goalType, parseGoalType(value), option);
             }
         }
         if (!goalId)
@@ -614,7 +654,7 @@ function parseGoals(args, baseUrl) {
         if (name === undefined
             && targetAmount === undefined
             && targetMonthKey === undefined
-            && isAchieved === undefined
+            && goalType === undefined
             && priority === undefined) {
             throw new UsageError('goals update requires at least one field to update');
         }
@@ -622,7 +662,7 @@ function parseGoals(args, baseUrl) {
             && (name !== undefined
                 || targetAmount !== undefined
                 || targetMonthKey !== undefined
-                || isAchieved !== undefined)) {
+                || goalType !== undefined)) {
             throw new UsageError('--priority must be used on its own');
         }
         return withBaseUrl({
@@ -631,12 +671,14 @@ function parseGoals(args, baseUrl) {
             ...(name === undefined ? {} : { name }),
             ...(targetAmount === undefined ? {} : { targetAmount }),
             ...(targetMonthKey === undefined ? {} : { targetMonthKey }),
-            ...(isAchieved === undefined ? {} : { isAchieved }),
+            ...(goalType === undefined ? {} : { goalType }),
             ...(priority === undefined ? {} : { priority }),
             apply,
         }, baseUrl);
     }
-    if (subcommand === 'delete') {
+    if (subcommand === 'mark-spent'
+        || subcommand === 'restore'
+        || subcommand === 'delete') {
         let goalId;
         let apply = false;
         for (let index = 0; index < args.length; index += 1) {
@@ -651,17 +693,22 @@ function parseGoals(args, baseUrl) {
                 ? argument.split(/=(.*)/s, 2)
                 : [argument, undefined];
             if (option !== '--goal-id') {
-                throw new UsageError(`Unknown goals delete option: ${argument}`);
+                throw new UsageError(`Unknown goals ${subcommand} option: ${argument}`);
             }
             const value = requireNonEmpty(inlineValue ?? readOptionValue(args, index, option), option);
             if (inlineValue === undefined)
                 index += 1;
             goalId = setOnce(goalId, parseGoalId(value), option);
         }
-        if (!goalId)
-            throw new UsageError('goals delete requires --goal-id <id>');
+        if (!goalId) {
+            throw new UsageError(`goals ${subcommand} requires --goal-id <id>`);
+        }
         return withBaseUrl({
-            command: 'goals-delete',
+            command: subcommand === 'mark-spent'
+                ? 'goals-mark-spent'
+                : subcommand === 'restore'
+                    ? 'goals-restore'
+                    : 'goals-delete',
             goalId,
             apply,
         }, baseUrl);
@@ -699,6 +746,10 @@ function helpTopic(argv) {
             return 'goals-create';
         if (subcommand === 'update')
             return 'goals-update';
+        if (subcommand === 'mark-spent')
+            return 'goals-mark-spent';
+        if (subcommand === 'restore')
+            return 'goals-restore';
         if (subcommand === 'delete')
             return 'goals-delete';
         return 'goals';
@@ -718,7 +769,11 @@ function helpTopic(argv) {
         return undefined;
     }
     if (command === 'budget') {
-        return subcommand === 'update' ? 'budget-update' : 'budget';
+        if (subcommand === 'update')
+            return 'budget-update';
+        if (subcommand === 'move')
+            return 'budget-move';
+        return 'budget';
     }
     if (command === 'accounts'
         || command === 'transactions'

package/dist/cli.js

@@ -1,10 +1,10 @@
 import fs from 'node:fs';
 import { parseArgs, resolveBaseUrl, } from './args.js';
 import { ICON_KEYS } from './category-metadata.js';
-import { parseApiResponse, validateAssignmentPayload, validateBudgetUpdatePayload, } from './contracts.js';
+import { parseApiResponse, validateAssignmentPayload, validateBudgetMovementResponse, validateBudgetUpdatePayload, } from './contracts.js';
 import { createSystemCredentialStore, secureStorageUnavailableError, } from './credential-store.js';
 import { ApiError, CliError, ConfigError, UsageError, } from './errors.js';
-export const CLI_VERSION = '0.9.1';
+export const CLI_VERSION = '0.11.0';
 const REQUEST_TIMEOUT_MS = 60_000;
 const API_ORIGIN_HELP_LINES = [
     '',
@@ -32,6 +32,8 @@ export function usageText() {
         '  sloth-agent budget --scope personal|joint [--period YYYY-MM] [--base-url URL]',
         '  sloth-agent budget update --scope personal|joint [--period YYYY-MM]',
         '    --input budget.json [--apply] [--base-url URL]',
+        '  sloth-agent budget move --scope personal|joint [--period YYYY-MM]',
+        '    --from-category-id ID --to-category-id ID --amount AMOUNT [--apply]',
         '  sloth-agent categories [list] [--base-url URL]',
         '  sloth-agent categories create --name NAME --icon-key KEY --type TYPE [--apply]',
         '  sloth-agent categories rename --category-id ID --name NAME [--apply]',
@@ -43,9 +45,11 @@ export function usageText() {
         '    [--cursor CURSOR] [--base-url URL]',
         '  sloth-agent assign --input assignments.json [--apply] [--base-url URL]',
         '  sloth-agent goals [list] [--base-url URL]',
-        '  sloth-agent goals create --name NAME [--target-amount AMOUNT]',
-        '    [--target-month YYYY-MM] [--apply] [--base-url URL]',
+        '  sloth-agent goals create --name NAME --target-amount AMOUNT',
+        '    --type keep|spend [--target-month YYYY-MM] [--apply] [--base-url URL]',
         '  sloth-agent goals update --goal-id ID [fields] [--apply] [--base-url URL]',
+        '  sloth-agent goals mark-spent --goal-id ID [--apply] [--base-url URL]',
+        '  sloth-agent goals restore --goal-id ID [--apply] [--base-url URL]',
         '  sloth-agent goals delete --goal-id ID [--apply] [--base-url URL]',
         '  sloth-agent ask-partner --transaction-ref REF [--base-url URL]',
         '',
@@ -455,6 +459,47 @@ export function budgetUpdateHelpText() {
         '  Apply mode returns the complete persisted budget response.',
     ].join('\n');
 }
+export function budgetMoveHelpText() {
+    return [
+        'Sloth Agent CLI — budget move',
+        '',
+        'Preview or move assigned money between categories or To Assign.',
+        '',
+        'Usage:',
+        '  sloth-agent budget move --scope personal|joint [--period YYYY-MM] --from-category-id ID --to-category-id ID --amount AMOUNT [--apply] [--base-url URL]',
+        '',
+        'Required inputs:',
+        '  --scope personal|joint  Budget ownership scope.',
+        '  --from-category-id ID   Source category ID, or to-assign.',
+        '  --to-category-id ID     Destination category ID, or to-assign.',
+        '  --amount AMOUNT         Positive amount in the budget currency, with up to two decimals.',
+        '                          The integer-pence value must be at most 9,007,199,254,740,991.',
+        '',
+        'Optional inputs:',
+        '  --period YYYY-MM        Defaults to the current Sloth budget period.',
+        '  --apply                 Send the movement. Without it, only validate and preview.',
+        '  --base-url URL          Override the API origin.',
+        '  -h, --help              Show this help.',
+        ...API_ORIGIN_HELP_LINES,
+        '',
+        'Write behavior:',
+        '  Without --apply, returns JSON locally without loading credentials or contacting Sloth Money.',
+        '  With --apply, atomically subtracts from the source and adds to the destination.',
+        '  Use the reserved ID to-assign to move money to or from To Assign.',
+        '  The move changes current assigned balances and records budget movement history.',
+        '  The source category or To Assign may become negative, so choose the source deliberately.',
+        '  It does not change planned amounts or future budget plans.',
+        '  Historical periods cannot be changed. Applying requires agent:write.',
+        '',
+        'Output:',
+        '  Preview mode returns dryRun, endpoint, method, and the amountPence payload.',
+        '  Apply mode returns the period, currency, movement, To Assign balance, and affected category balances.',
+        '',
+        'Examples:',
+        '  sloth-agent budget move --scope personal --from-category-id activities --to-category-id groceries --amount 52.95',
+        '  sloth-agent budget move --scope personal --from-category-id activities --to-category-id groceries --amount 52.95 --apply',
+    ].join('\n');
+}
 export function transactionsHelpText() {
     return [
         'Sloth Agent CLI — transactions',
@@ -578,12 +623,14 @@ export function goalsHelpText() {
     return [
         'Sloth Agent CLI — goals',
         '',
-        'List, create, update, or delete your savings goals.',
+        'List, create, update, mark spent, restore, or delete your savings goals.',
         '',
         'Commands:',
         '  sloth-agent goals list      List goals; "sloth-agent goals" is equivalent.',
         '  sloth-agent goals create    Preview or create a goal.',
         '  sloth-agent goals update    Preview or update selected goal fields.',
+        '  sloth-agent goals mark-spent Preview or mark a Spend goal spent.',
+        '  sloth-agent goals restore   Preview or restore a spent goal.',
         '  sloth-agent goals delete    Preview or permanently delete a goal.',
         '',
         'Help:',
@@ -611,7 +658,8 @@ export function goalsListHelpText() {
         '',
         'Output:',
         '  JSON containing currency and goals. Each goal contains id, name, priority,',
-        '  targetAmount, targetMonthKey, isAchieved, and sharedWithPartner.',
+        '  targetAmount, targetMonthKey, goalType, nullable spentAt, and',
+        '  sharedWithPartner.',
     ].join('\n');
 }
 export function goalsCreateHelpText() {
@@ -621,11 +669,12 @@ export function goalsCreateHelpText() {
         'Preview or create a goal.',
         '',
         'Usage:',
-        '  sloth-agent goals create --name NAME [options]',
+        '  sloth-agent goals create --name NAME --target-amount AMOUNT --type keep|spend [options]',
         '',
         'Options:',
         '  --name NAME                 Required. Goal name, 1 to 200 characters.',
-        '  --target-amount AMOUNT      Optional. Positive major-unit amount with up to 2 decimals.',
+        '  --target-amount AMOUNT      Required. Positive major-unit amount with up to 2 decimals.',
+        '  --type keep|spend           Required. Keep reserves funded money; Spend is spent later.',
         '  --target-month YYYY-MM      Optional. Target calendar month.',
         '  --apply                     Optional. Create the goal in Sloth Money.',
         '  --base-url URL              Optional. Override the API origin.',
@@ -638,8 +687,8 @@ export function goalsCreateHelpText() {
         '  New goals are private to the owner and appended to the existing goal order.',
         '',
         'Example:',
-        '  sloth-agent goals create --name "Emergency fund" --target-amount 12000',
-        '  sloth-agent goals create --name "Emergency fund" --target-amount 12000 --apply',
+        '  sloth-agent goals create --name "Emergency fund" --target-amount 12000 --type keep',
+        '  sloth-agent goals create --name "Wedding" --target-amount 22000 --type spend --target-month 2027-06 --apply',
         '',
         'Output:',
         '  Preview mode returns dryRun, method, endpoint, and payload.',
@@ -659,10 +708,9 @@ export function goalsUpdateHelpText() {
         '  --goal-id ID                 Required. Goal ID from goals list or create output.',
         '  --name NAME                  Optional. Replacement name, 1 to 200 characters.',
         '  --target-amount AMOUNT       Optional. Positive amount with up to 2 decimals.',
-        '  --clear-target-amount        Optional. Remove the target amount.',
         '  --target-month YYYY-MM       Optional. Replace the target month.',
         '  --clear-target-month         Optional. Remove the target month.',
-        '  --achieved=true|false        Optional. Mark the goal achieved or active.',
+        '  --type keep|spend            Optional. Change how funded money is treated.',
         '  --priority POSITION          Optional. Positive whole-number position; 1 is highest.',
         '  --apply                      Optional. Write the partial update.',
         '  --base-url URL               Optional. Override the API origin.',
@@ -676,9 +724,8 @@ export function goalsUpdateHelpText() {
         '  Moving a goal shifts the intervening goals automatically.',
         '  Forecast assignments and shared progress refresh when the owner next opens',
         '  the Forecast screen.',
-        '  Set and clear options for the same field are mutually exclusive.',
-        '  Marking a goal achieved removes its forecast assignment.',
-        '  Marking it active again does not restore the previous assignment.',
+        '  Set and clear target-month options are mutually exclusive.',
+        '  Restore a spent goal before changing its type.',
         '  Change active shared pot target amounts in the Sloth Budget app, where',
         '  account balances can be reconciled across goals in priority order.',
         '  Sharing remains app-managed. Updates to an already shared goal remain visible',
@@ -689,6 +736,7 @@ export function goalsUpdateHelpText() {
         '  Applying requires a write-enabled token created with Allow changes.',
         '',
         'Example:',
+        '  sloth-agent goals update --goal-id wedding --type spend --apply',
         '  sloth-agent goals update --goal-id goal-3 --priority 2 --apply',
         '',
         'Output:',
@@ -696,6 +744,63 @@ export function goalsUpdateHelpText() {
         '  Apply mode returns the complete persisted goal and currency.',
     ].join('\n');
 }
+export function goalsMarkSpentHelpText() {
+    return [
+        'Sloth Agent CLI — goals mark-spent',
+        '',
+        'Preview or mark a Spend goal spent.',
+        '',
+        'Usage:',
+        '  sloth-agent goals mark-spent --goal-id ID [--apply] [--base-url URL]',
+        '',
+        'Options:',
+        '  --goal-id ID   Required. Spend goal ID from goals list or create output.',
+        '  --apply        Optional. Mark the goal spent in Sloth Money.',
+        '  --base-url URL Optional. Override the API origin.',
+        '  -h, --help     Show this help.',
+        ...API_ORIGIN_HELP_LINES,
+        '',
+        'Safety and lifecycle:',
+        '  Without --apply, the command previews PATCH {"isSpent":true} and does not write.',
+        '  Keep goals cannot be marked spent. Change an active goal to Spend first.',
+        '  A spent goal is excluded from future goal allocation until restored.',
+        '',
+        'Example:',
+        '  sloth-agent goals mark-spent --goal-id wedding --apply',
+        '',
+        'Output:',
+        '  Preview mode returns dryRun, method, endpoint, and payload.',
+        '  Apply mode returns the complete persisted goal and currency.',
+    ].join('\n');
+}
+export function goalsRestoreHelpText() {
+    return [
+        'Sloth Agent CLI — goals restore',
+        '',
+        'Preview or restore a spent Spend goal.',
+        '',
+        'Usage:',
+        '  sloth-agent goals restore --goal-id ID [--apply] [--base-url URL]',
+        '',
+        'Options:',
+        '  --goal-id ID   Required. Spent goal ID from goals list output.',
+        '  --apply        Optional. Restore the goal in Sloth Money.',
+        '  --base-url URL Optional. Override the API origin.',
+        '  -h, --help     Show this help.',
+        ...API_ORIGIN_HELP_LINES,
+        '',
+        'Safety and lifecycle:',
+        '  Without --apply, the command previews PATCH {"isSpent":false} and does not write.',
+        '  Restoring clears spentAt and returns the goal to allocation at its saved priority.',
+        '',
+        'Example:',
+        '  sloth-agent goals restore --goal-id wedding --apply',
+        '',
+        'Output:',
+        '  Preview mode returns dryRun, method, endpoint, and payload.',
+        '  Apply mode returns the complete persisted goal and currency.',
+    ].join('\n');
+}
 export function goalsDeleteHelpText() {
     return [
         'Sloth Agent CLI — goals delete',
@@ -762,6 +867,7 @@ export function commandHelpText(topic) {
         'accounts-remove': accountsRemoveHelpText,
         investments: investmentsHelpText,
         budget: budgetHelpText,
+        'budget-move': budgetMoveHelpText,
         'budget-update': budgetUpdateHelpText,
         categories: categoriesHelpText,
         'categories-create': categoriesCreateHelpText,
@@ -774,6 +880,8 @@ export function commandHelpText(topic) {
         'goals-list': goalsListHelpText,
         'goals-create': goalsCreateHelpText,
         'goals-update': goalsUpdateHelpText,
+        'goals-mark-spent': goalsMarkSpentHelpText,
+        'goals-restore': goalsRestoreHelpText,
         'goals-delete': goalsDeleteHelpText,
         'ask-partner': askPartnerHelpText,
     };
@@ -1076,6 +1184,24 @@ export async function runCli(argv = process.argv.slice(2), options = {}) {
             });
             return 0;
         }
+        const budgetMovementPayload = parsed.command === 'budget-move'
+            ? {
+                scope: parsed.scope,
+                ...(parsed.periodKey === undefined ? {} : { periodKey: parsed.periodKey }),
+                fromCategoryId: parsed.fromCategoryId,
+                toCategoryId: parsed.toCategoryId,
+                amountPence: parsed.amountPence,
+            }
+            : undefined;
+        if (parsed.command === 'budget-move' && !parsed.apply) {
+            writeJson(writeStdout, {
+                dryRun: true,
+                endpoint: `${baseUrl}/api/agent/v1/budget-movements`,
+                method: 'POST',
+                payload: budgetMovementPayload,
+            });
+            return 0;
+        }
         const credential = await resolveCredential(environment, baseUrl, getCredentialStore);
         token = credential.token;
         const headers = requestHeaders(token);
@@ -1118,6 +1244,17 @@ export async function runCli(argv = process.argv.slice(2), options = {}) {
             writeJson(writeStdout, data);
             return 0;
         }
+        if (parsed.command === 'budget-move') {
+            const response = await fetchImplementation(`${baseUrl}/api/agent/v1/budget-movements`, {
+                method: 'POST',
+                headers: { ...headers, 'Content-Type': 'application/json' },
+                body: JSON.stringify(budgetMovementPayload),
+                signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+            });
+            const data = validateBudgetMovementResponse(await parseHttpResponse(response, token), budgetMovementPayload);
+            writeJson(writeStdout, data);
+            return 0;
+        }
         if (parsed.command === 'categories-create'
             || parsed.command === 'categories-rename'
             || parsed.command === 'line-items-create'
@@ -1156,12 +1293,11 @@ export async function runCli(argv = process.argv.slice(2), options = {}) {
             const endpoint = `${baseUrl}/api/agent/v1/goals`;
             const payload = {
                 name: parsed.name,
-                ...(parsed.targetAmount === undefined
-                    ? {}
-                    : { targetAmount: parsed.targetAmount }),
+                targetAmount: parsed.targetAmount,
                 ...(parsed.targetMonthKey === undefined
                     ? {}
                     : { targetMonthKey: parsed.targetMonthKey }),
+                goalType: parsed.goalType,
             };
             if (!parsed.apply) {
                 writeJson(writeStdout, {
@@ -1185,23 +1321,27 @@ export async function runCli(argv = process.argv.slice(2), options = {}) {
             writeJson(writeStdout, data);
             return 0;
         }
-        if (parsed.command === 'goals-update') {
+        if (parsed.command === 'goals-update'
+            || parsed.command === 'goals-mark-spent'
+            || parsed.command === 'goals-restore') {
             const endpoint = `${baseUrl}/api/agent/v1/goals/${encodeURIComponent(parsed.goalId)}`;
-            const payload = {
-                ...(parsed.name === undefined ? {} : { name: parsed.name }),
-                ...(parsed.targetAmount === undefined
-                    ? {}
-                    : { targetAmount: parsed.targetAmount }),
-                ...(parsed.targetMonthKey === undefined
-                    ? {}
-                    : { targetMonthKey: parsed.targetMonthKey }),
-                ...(parsed.isAchieved === undefined
-                    ? {}
-                    : { isAchieved: parsed.isAchieved }),
-                ...(parsed.priority === undefined
-                    ? {}
-                    : { priority: parsed.priority }),
-            };
+            const payload = parsed.command === 'goals-update'
+                ? {
+                    ...(parsed.name === undefined ? {} : { name: parsed.name }),
+                    ...(parsed.targetAmount === undefined
+                        ? {}
+                        : { targetAmount: parsed.targetAmount }),
+                    ...(parsed.targetMonthKey === undefined
+                        ? {}
+                        : { targetMonthKey: parsed.targetMonthKey }),
+                    ...(parsed.goalType === undefined
+                        ? {}
+                        : { goalType: parsed.goalType }),
+                    ...(parsed.priority === undefined
+                        ? {}
+                        : { priority: parsed.priority }),
+                }
+                : { isSpent: parsed.command === 'goals-mark-spent' };
             if (!parsed.apply) {
                 writeJson(writeStdout, {
                     dryRun: true,
@@ -1220,8 +1360,8 @@ export async function runCli(argv = process.argv.slice(2), options = {}) {
                 body: JSON.stringify(payload),
                 signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
             });
-            const data = parseApiResponse('goals-update', await parseHttpResponse(response, token));
-            writeJson(writeStdout, parsed.priority === undefined
+            const data = parseApiResponse(parsed.command, await parseHttpResponse(response, token));
+            writeJson(writeStdout, parsed.command !== 'goals-update' || parsed.priority === undefined
                 ? data
                 : withUpdatedGoalPriority(data, parsed.priority));
             return 0;

package/dist/contracts.js

@@ -1,5 +1,6 @@
 import { ApiError, UsageError, } from './errors.js';
 import { CATEGORY_TYPES, ICON_KEYS } from './category-metadata.js';
+import { isGoalType } from './goal-metadata.js';
 function isObject(value) {
     return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 }
@@ -297,7 +298,8 @@ function isGoal(value) {
             'name',
             'targetAmount',
             'targetMonthKey',
-            'isAchieved',
+            'goalType',
+            'spentAt',
             'sharedWithPartner',
         ])
         && typeof value.id === 'string'
@@ -309,7 +311,10 @@ function isGoal(value) {
         && (value.targetMonthKey === null
             || (typeof value.targetMonthKey === 'string'
                 && /^\d{4}-(0[1-9]|1[0-2])$/.test(value.targetMonthKey)))
-        && typeof value.isAchieved === 'boolean'
+        && isGoalType(value.goalType)
+        && (value.goalType === 'spend'
+            ? value.spentAt === null || isIsoDateTime(value.spentAt)
+            : value.spentAt === null)
         && typeof value.sharedWithPartner === 'boolean');
 }
 function isCurrency(value) {
@@ -370,6 +375,63 @@ function isBudgetResponse(value) {
         && Array.isArray(value.categories)
         && value.categories.every(isBudgetCategory));
 }
+function isBudgetMovementResponse(value) {
+    return (isObject(value)
+        && hasOnlyFields(value, [
+            'moved',
+            'scope',
+            'periodKey',
+            'currency',
+            'fromCategoryId',
+            'toCategoryId',
+            'amountPence',
+            'toAssignPence',
+            'categoryBalances',
+        ])
+        && value.moved === true
+        && (value.scope === 'personal' || value.scope === 'joint')
+        && typeof value.periodKey === 'string'
+        && /^\d{4}-(0[1-9]|1[0-2])$/.test(value.periodKey)
+        && isCurrency(value.currency)
+        && typeof value.fromCategoryId === 'string'
+        && value.fromCategoryId.trim().length > 0
+        && typeof value.toCategoryId === 'string'
+        && value.toCategoryId.trim().length > 0
+        && value.fromCategoryId !== value.toCategoryId
+        && isNonnegativeSafeInteger(value.amountPence)
+        && value.amountPence > 0
+        && isSafeInteger(value.toAssignPence)
+        && Array.isArray(value.categoryBalances)
+        && value.categoryBalances.length >= 1
+        && value.categoryBalances.length <= 2
+        && value.categoryBalances.every((balance) => (isObject(balance)
+            && hasOnlyFields(balance, ['categoryId', 'assignedPence'])
+            && typeof balance.categoryId === 'string'
+            && balance.categoryId.trim().length > 0
+            && isSafeInteger(balance.assignedPence))));
+}
+export function validateBudgetMovementResponse(value, expected) {
+    if (!isBudgetMovementResponse(value)) {
+        throw new ApiError('Invalid budget-move response from the Agent API');
+    }
+    const expectedCategoryIds = [expected.fromCategoryId, expected.toCategoryId]
+        .filter(categoryId => categoryId !== 'to-assign')
+        .sort();
+    const actualCategoryIds = value.categoryBalances
+        .map(balance => balance.categoryId)
+        .sort();
+    const matchesRequest = value.scope === expected.scope
+        && (expected.periodKey === undefined || value.periodKey === expected.periodKey)
+        && value.fromCategoryId === expected.fromCategoryId
+        && value.toCategoryId === expected.toCategoryId
+        && value.amountPence === expected.amountPence;
+    const matchesAffectedCategories = actualCategoryIds.length === expectedCategoryIds.length
+        && actualCategoryIds.every((categoryId, index) => categoryId === expectedCategoryIds[index]);
+    if (!matchesRequest || !matchesAffectedCategories) {
+        throw new ApiError('Invalid budget-move response from the Agent API');
+    }
+    return value;
+}
 function isNullableNonEmptyString(value) {
     return value === null || (typeof value === 'string'
         && value.length > 0
@@ -506,23 +568,25 @@ export function parseApiResponse(command, value) {
                     ? isInvestmentsResponse(value)
                     : command === 'budget' || command === 'budget-update'
                         ? isBudgetResponse(value)
-                        : command === 'categories'
-                            ? isCategoryResponse(value)
-                            : command === 'categories-create' || command === 'categories-rename'
-                                ? isCategoryMutationResponse(value)
-                                : command === 'line-items-create' || command === 'line-items-rename'
-                                    ? isLineItemMutationResponse(value)
-                                    : command === 'transactions'
-                                        ? isTransactionsResponse(value)
-                                        : command === 'assign'
-                                            ? isAssignmentResponse(value)
-                                            : command === 'ask-partner'
-                                                ? isPartnerResponse(value)
-                                                : command === 'goals-list'
-                                                    ? isGoalsResponse(value)
-                                                    : command === 'goals-delete'
-                                                        ? isGoalDeleteResponse(value)
-                                                        : isGoalMutationResponse(value);
+                        : command === 'budget-move'
+                            ? isBudgetMovementResponse(value)
+                            : command === 'categories'
+                                ? isCategoryResponse(value)
+                                : command === 'categories-create' || command === 'categories-rename'
+                                    ? isCategoryMutationResponse(value)
+                                    : command === 'line-items-create' || command === 'line-items-rename'
+                                        ? isLineItemMutationResponse(value)
+                                        : command === 'transactions'
+                                            ? isTransactionsResponse(value)
+                                            : command === 'assign'
+                                                ? isAssignmentResponse(value)
+                                                : command === 'ask-partner'
+                                                    ? isPartnerResponse(value)
+                                                    : command === 'goals-list'
+                                                        ? isGoalsResponse(value)
+                                                        : command === 'goals-delete'
+                                                            ? isGoalDeleteResponse(value)
+                                                            : isGoalMutationResponse(value);
     if (!valid) {
         const label = command === 'assign' ? 'assignment' : command;
         throw new ApiError(`Invalid ${label} response from the Agent API`);

package/dist/goal-metadata.js

@@ -0,0 +1,4 @@
+export const GOAL_TYPES = ['keep', 'spend'];
+export function isGoalType(value) {
+    return typeof value === 'string' && GOAL_TYPES.includes(value);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slothmoney/agent-cli",
-  "version": "0.9.1",
+  "version": "0.11.0",
   "description": "Command-line access to the Sloth Money Agent API.",
   "type": "module",
   "bin": {