@kaleidorg/mind 0.9.0 → 0.10.0

package/skills/submarine-swaps/SKILL.md

@@ -1,48 +1,30 @@
 ---
 name: submarine-swaps
-description: "Pay a Lightning invoice from Liquid funds (L-USDT or L-BTC) through a KaleidoSwap submarine swap on the /v2 maker, and follow its status. Triggers when the user wants to pay a Lightning invoice with Liquid USDT / L-USDT / L-BTC, asks what Liquid assets can pay Lightning, or asks about a submarine swap."
+description: "Pay a Lightning invoice from Liquid funds (L-USDT or L-BTC) through a KaleidoSwap submarine swap, and follow its status."
 tools: kaleidoswap_submarine_pairs, kaleidoswap_submarine_create, kaleidoswap_submarine_fund, kaleidoswap_submarine_status
-triggers: l-usdt, liquid usdt, usdt on liquid, l-btc, liquid bitcoin, submarine, submarine swap, pay invoice with liquid, swap status
+requires-tools: kaleidoswap_submarine_create
+triggers: l-usdt, liquid usdt, usdt on liquid, l-btc, liquid bitcoin, submarine, submarine swap, pay invoice with liquid
 metadata:
   author: kaleidoswap
-  version: "0.1.0"
+  version: "0.2.0"
 ---
+# Submarine swaps
 
-# Submarine swaps — pay Lightning from Liquid
+The user locks Liquid funds; the maker pays the Lightning invoice, then claims
+the lockup. If the maker can't pay, the lockup is refundable. Plain "USDT" is
+RGB USDT (`kaleido-trading`), not this skill.
 
-A submarine swap pays a Lightning (BOLT11) invoice with funds the user locks on
-Liquid. The KaleidoSwap maker pays the invoice, then claims the lockup. It is
-atomic: if the maker can't pay, the lockup is refunded to the user.
-
-## Critical rules
-
-- Every amount, fee and status in your reply MUST come from a tool result in the
-  CURRENT turn. Never guess the amount to lock — `kaleidoswap_submarine_create`
-  returns it.
-- `kaleidoswap_submarine_fund` moves money. Call it ONLY after the user has
-  confirmed the exact `expected_amount` returned by `kaleidoswap_submarine_create`.
-- `kaleidoswap_submarine_fund` takes only `swap_id`. Never try to pass an amount
-  or an address.
-- A bare "USDT" means RGB USDT on the Lightning node, which uses the atomic swap
-  tools, not this skill. Use this skill only for Liquid assets (L-USDT, L-BTC).
-
-## Flow
-
-1. `kaleidoswap_submarine_create { invoice, from_asset }` — from_asset is
-   `L-USDT` (default) or `L-BTC`. Returns `swap_id`, `expected_amount` (smallest
-   unit: L-USDT has 8 decimals, L-BTC is sats) and the fees.
+## Do
+1. `kaleidoswap_submarine_create` (`invoice`, `from_asset`) — `from_asset` is
+   `L-USDT` (default) or `L-BTC`. Returns `swap_id`, `expected_amount`
+   (smallest unit, 8 decimals for both) and fees. Nothing moves yet.
 2. Tell the user the amount and ask to confirm.
-3. `kaleidoswap_submarine_fund { swap_id }`.
-4. `kaleidoswap_submarine_status { swap_id }` — `transaction.claimed` means the
-   invoice was paid. `failed: true` on a funded swap means the funds need a refund;
-   say so and quote the `refund` field.
-
-Use `kaleidoswap_submarine_pairs` when the user asks what can pay a Lightning
-invoice, or for the limits and fees.
+3. `kaleidoswap_submarine_fund` (`swap_id` only; confirm-gated).
+4. `kaleidoswap_submarine_status` (`swap_id`) — `transaction.claimed` means paid;
+   `failed: true` on a funded swap needs a refund: quote the `refund` field.
+- Limits and fees: `kaleidoswap_submarine_pairs {}`.
 
 ## Examples
-
-- "pay lntbs10u1p… with L-USDT" →
-  `kaleidoswap_submarine_create { invoice: "lntbs10u1p…", from_asset: "L-USDT" }`
-- "did my Liquid payment go through? swap sub1" →
-  `kaleidoswap_submarine_status { swap_id: "sub1" }`
+- "Pay lntbs10u1p… with L-USDT" → `kaleidoswap_submarine_create {"invoice":"lntbs10u1p…","from_asset":"L-USDT"}`
+- "Did swap sub1 go through?" → `kaleidoswap_submarine_status {"swap_id":"sub1"}`
+- "What can pay Lightning from Liquid?" → `kaleidoswap_submarine_pairs {}`

package/skills/wallet-assistant/SKILL.md

@@ -1,49 +1,31 @@
 ---
 name: wallet-assistant
-description: Everyday wallet tasks on this phone — check the BTC/asset balance, create an invoice to receive, send a payment, look up a contact, or quote a swap (e.g. "how many sats is 10 USDT?"). Triggers when the user asks about their balance, wants to receive or send money, pay an invoice, pay a contact, or convert between BTC and supported assets.
-tools: get_balances, rln_get_balances, wdk_get_balances, spark_get_balance, rln_get_asset_balance, wdk_get_asset_balance, rln_list_assets, wdk_list_assets, rln_get_address, wdk_get_address, spark_get_address, spark_get_onchain_address, resolve_contact, send_payment, rln_send_btc, wdk_send_btc, rln_send_asset, wdk_send_asset, spark_send, spark_send_sats, rln_pay_invoice, wdk_pay_invoice, spark_pay_invoice, spark_pay_lightning_invoice, rln_create_ln_invoice, wdk_create_ln_invoice, spark_create_invoice, spark_create_lightning_invoice, rln_create_rgb_invoice, wdk_create_rgb_invoice, rln_list_payments, wdk_list_payments, kaleidoswap_get_quote
-triggers: balance, pay, send, receive, address, invoice, transactions, contact, funds, money
+description: "Everyday wallet tasks in the app across all layers: balance, receive (invoice or address), send or pay, contacts, BTC price and fiat conversion."
+tools: get_balances, create_invoice, send_payment, resolve_contact, get_price, fiat_to_sats, rln_list_assets, rln_pay_invoice, spark_pay_invoice
+requires-tools: get_balances
+triggers: balance, balances, pay, send, receive, address, invoice, contact, funds, money, price, how much
+metadata:
+  author: kaleidoswap
+  version: "0.3.0"
 ---
-
 # Wallet assistant
 
-You operate the user's on-device multi-L2 Bitcoin wallet. ALWAYS use a tool to
-get real data — NEVER invent a balance, address, amount, price, or quote.
-
-## Critical rules
-
-You have no knowledge of balances, addresses, invoices, prices, or quotes.
-Every value in your reply MUST come from a tool result returned in the CURRENT
-turn — do not reuse a number from a previous turn.
-
-NEVER mention the exact name of any tool (such as "kaleidoswap_get_quote") in
-your text reply to the user. Only use tools via the proper function call
-format when needed; describe what you are doing in plain language.
-
-When a tool returns multiple fields, **report all the load-bearing ones**:
-- The balance tool may return `{confirmed, pending, total}` — when `pending`
-  is non-zero, report BOTH. `confirmed` is spendable; `pending` is settling
-  and is NOT spendable yet. The user needs to know the difference.
-- The quote tool returns display strings (e.g. the to amount and fee in
-  human readable form). Read these strings verbatim — do NOT do unit math
-  yourself.
-
-## Rules
-
-- **Balance / "how much do I have"** → use the balance tool, then state the
-  number.
-- **Receive / "an invoice for N sats"** → use the invoice creation tool (for
-  the appropriate layer) with the amount.
-- **"How many sats is N USDT?" / "What's 0.1 BTC in USDT?" / "convert N X
-  to Y"** → use the quote/conversion tool and
-  read the display fields from the result. Supported pairs: any of
-  BTC/USDT/XAUT against each other. Fiat (EUR/USD/GBP) is NOT quoted by
-  the maker — if the user asks "how much sats is 10 EUR", say so plainly
-  and offer USDT as the closest analogue (USDT is a USD-pegged stablecoin).
-- **Pay a Lightning invoice** → use the lightning payment tool.
-- **Send to a person/amount** → first resolve the contact, then use the send
-  payment tool with the amount in sats and the recipient. State the amount and
-  destination; the app asks the user to confirm before it sends.
-
-Keep replies short, but never drop a balance component, a fee, or the
-quote's `rfq_id` when present.
+The app routes these tools to the right layer (Spark, RLN, Arkade, Liquid).
+`amount_sats` is satoshis; other amounts are display units of the asset.
+
+## Do
+- Balance: `get_balances` (add `layer` for one layer). Report every component;
+  `pending` is not spendable yet.
+- Receive: `create_invoice` with `asset` and optional `amount`; reply with the
+  full invoice or address returned.
+- Send to a name: `resolve_contact` first, then `send_payment`. A BOLT11
+  invoice the user pasted: `rln_pay_invoice` or `spark_pay_invoice`. Every
+  send is confirm-gated; state amount and destination.
+- Fiat: `fiat_to_sats` converts; `get_price` gives the BTC price.
+- Swaps go to `kaleido-trading` (RGB) or `flashnet-swaps` (Spark tokens).
+
+## Examples
+- "What's my balance?" → `get_balances {}`
+- "Invoice for 2000 sats" → `create_invoice {"asset":"BTC","amount":2000}`
+- "Send 5000 sats to bob" → `resolve_contact {"name":"bob"}` then `send_payment {"to":"<bob's address>","amount_sats":5000}`
+- "How many sats is 10 EUR?" → `fiat_to_sats {"amount":10,"currency":"EUR"}`

package/src/funnel.mind.test.ts

@@ -318,10 +318,11 @@ describe('desktop mind — skill scoping (real skills)', () => {
     );
   });
 
-  it('wallet-assistant (triggers on "balance") exposes the real rln_*/wdk_* tool names', () => {
+  it('wallet-assistant is the in-app router; the node skill carries the rln_* balance tools', () => {
     const wallet = SKILLS.find((s) => s.name === 'wallet-assistant')!;
-    expect(wallet.tools).toEqual(expect.arrayContaining(['rln_get_balances', 'wdk_get_balances']));
-    expect(wallet.tools).toEqual(expect.arrayContaining(['rln_get_address', 'rln_send_btc', 'rln_create_ln_invoice']));
+    expect(wallet.metadata?.['requires-tools']).toBe('get_balances');
+    const node = SKILLS.find((s) => s.name === 'rgb-lightning-node')!;
+    expect(node.tools).toEqual(expect.arrayContaining(['rln_get_balances', 'rln_get_address', 'rln_send_btc', 'rln_create_ln_invoice']));
   });
 
   it('rgb-lightning-node (triggers on "channels") exposes only canonical rln_* tools', () => {
@@ -361,9 +362,9 @@ describe('desktop mind — skill scoping (real skills)', () => {
     const res = await funnel.runTurn("what's my balance?");
 
     expect(res.tier).toBe('agentic');
-    // wallet-assistant is selected AND rln_get_balances survives its scoping…
+    // Node-only host: the RGB node skill is selected AND rln_get_balances survives its scoping…
     const agenticLine = logs.find((l) => l.startsWith('tier=agentic'));
-    expect(agenticLine).toMatch(/skill=wallet-assistant/);
+    expect(agenticLine).toMatch(/skill=rgb-lightning-node/);
     expect(agenticLine).toMatch(/rln_get_balances/);
     // …and the tool actually executes (not narrated).
     expect(calls.map((c) => c.name)).toContain('rln_get_balances');

package/src/guards.test.ts

@@ -6,6 +6,7 @@ import { InProcessToolSource } from './tools/in-process.js';
 import { parseSkill, SkillRegistry } from './skills/registry.js';
 import { scriptedProvider } from './testing/scripted-provider.js';
 import { confirmReadback } from './wallet/confirm.js';
+import { getKaleidoswapTool } from './kaleidoswap/contract.js';
 import {
   DECLINED_TOOL_MESSAGE,
   detectWalletAction,
@@ -31,7 +32,18 @@ const ISSUE_SCHEMA = {
 
 const INVOICE = 'lnbcrt50u1pn9xyzpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypq';
 
+const QUOTE = { name: 'kaleidoswap_get_quote', parameters: getKaleidoswapTool('kaleidoswap_get_quote')!.parameters };
+
 describe('validateToolArgs', () => {
+  it('rejects sats passed as a BTC display amount and names the BTC value', () => {
+    const r = validateToolArgs(QUOTE, { from_asset_id: 'BTC', to_asset_id: 'USDT', from_amount: 50_000 });
+    expect(r.ok).toBe(false);
+    expect(r.errors.join(' ')).toMatch(/from_amount: 0\.0005/);
+    expect(validateToolArgs(QUOTE, { from_asset_id: 'BTC', to_asset_id: 'USDT', from_amount: 0.0005 }).ok).toBe(true);
+    expect(validateToolArgs(QUOTE, { from_asset_id: 'USDT', to_asset_id: 'BTC', from_amount: 5000 }).ok).toBe(true);
+    expect(validateToolArgs(QUOTE, { from_asset_id: 'BTC', to_asset_id: 'USDT', from_amount: 1, to_amount: 2 }).ok).toBe(false);
+  });
+
   it('accepts valid args and coerces numeric strings', () => {
     const r = validateToolArgs({ name: 'rln_issue_asset', parameters: ISSUE_SCHEMA }, { name: 'Hack', ticker: 'HCK', amount: '1000' });
     expect(r.ok).toBe(true);

package/src/guards.ts

@@ -78,6 +78,26 @@ const SEMANTIC_RULES: Record<string, (a: Record<string, unknown>) => string[]> =
 };
 SEMANTIC_RULES.wdk_issue_asset = SEMANTIC_RULES.rln_issue_asset!;
 
+/** Above this, a BTC amount in display units is almost certainly sats. */
+const MAX_PLAUSIBLE_BTC = 1000;
+
+/** KaleidoSwap quote amounts are display units; reject sats passed as BTC. */
+function btcDisplayAmounts(a: Record<string, unknown>): string[] {
+  const errors: string[] = [];
+  const legs: Array<[string, unknown]> = [['from_amount', a.from_asset_id], ['to_amount', a.to_asset_id]];
+  if (a.from_amount != null && a.to_amount != null) errors.push('give only one of "from_amount" or "to_amount"');
+  for (const [key, asset] of legs) {
+    const v = a[key];
+    if (typeof v !== 'number' || !/^btc$/i.test(String(asset ?? '').trim())) continue;
+    if (v >= MAX_PLAUSIBLE_BTC) {
+      errors.push(`"${key}" is in BTC, not sats: ${v} sats is ${+(v / 1e8).toFixed(8)} BTC — pass ${key}: ${+(v / 1e8).toFixed(8)}`);
+    }
+  }
+  return errors;
+}
+SEMANTIC_RULES.kaleidoswap_get_quote = btcDisplayAmounts;
+SEMANTIC_RULES.kaleidoswap_get_spreads = btcDisplayAmounts;
+
 /**
  * Validate (and lightly coerce) a tool call's arguments against its schema.
  * Unknown schema shapes pass through unchanged.

package/src/index.ts

@@ -49,6 +49,7 @@ export {
   walletTools,
   toToolDefs,
   bindWalletTools,
+  normalizeWalletArgs,
 } from './wallet/contract.js';
 export type {
   WalletLayer,

package/src/kaleidoswap/contract.test.ts

@@ -6,6 +6,7 @@ import {
   getKaleidoswapTool,
   kaleidoswapTools,
   bindKaleidoswapTools,
+  normalizeKaleidoswapArgs,
   type KaleidoswapHandler,
 } from './contract.js';
 
@@ -109,10 +110,14 @@ describe('bindKaleidoswapTools', () => {
     expect(pairs?.requiresConfirmation).toBeFalsy();
   });
 
-  it('dispatches execute() to the right handler with args', async () => {
+  it('dispatches execute() with kaleido-mcp args plus the legacy aliases', async () => {
     const src = bindKaleidoswapTools(echoHandlers());
-    const r = await src.execute('kaleidoswap_get_quote', { from_asset: 'BTC', to_asset: 'USDT', amount: 100_000 });
-    expect(r).toMatchObject({ ok: true, tool: 'get_quote', args: { from_asset: 'BTC', amount: 100_000 } });
+    const r = await src.execute('kaleidoswap_get_quote', { from_asset_id: 'BTC', to_asset_id: 'USDT', from_amount: 0.001 });
+    expect(r).toMatchObject({
+      ok: true,
+      tool: 'get_quote',
+      args: { from_asset_id: 'BTC', to_asset_id: 'USDT', from_amount: 0.001, from_asset: 'BTC', to_asset: 'USDT', amount: 100_000 },
+    });
   });
 
   it('throws when a handler is missing and allowMissing is false', () => {
@@ -142,3 +147,27 @@ describe('bindKaleidoswapTools', () => {
     expect(src.id).toBe('maker-prod');
   });
 });
+
+describe('normalizeKaleidoswapArgs', () => {
+  it('maps a display-unit quote to the legacy sats amount', () => {
+    expect(normalizeKaleidoswapArgs('kaleidoswap_get_quote', { from_asset_id: 'BTC', to_asset_id: 'USDT', from_amount: 0.0005 }))
+      .toMatchObject({ from_asset: 'BTC', to_asset: 'USDT', amount: 50_000 });
+  });
+
+  it('keeps RGB amounts in display units and marks a buy-side amount', () => {
+    expect(normalizeKaleidoswapArgs('kaleidoswap_get_quote', { from_asset_id: 'BTC', to_asset_id: 'USDT', to_amount: 10 }))
+      .toMatchObject({ amount: 10, amount_side: 'to' });
+  });
+
+  it('maps a legacy sats quote to display units', () => {
+    expect(normalizeKaleidoswapArgs('kaleidoswap_get_quote', { from_asset: 'BTC', to_asset: 'USDT', amount: 100_000 }))
+      .toMatchObject({ from_asset_id: 'BTC', to_asset_id: 'USDT', from_amount: 0.001 });
+    expect(normalizeKaleidoswapArgs('kaleidoswap_get_quote', { from_asset: 'USDT', to_asset: 'BTC', amount: 25 }))
+      .toMatchObject({ from_amount: 25 });
+  });
+
+  it('aliases rfq_id/quote_id and payment_hash/atomic_id', () => {
+    expect(normalizeKaleidoswapArgs('kaleidoswap_atomic_init', { rfq_id: 'r1' })).toMatchObject({ quote_id: 'r1' });
+    expect(normalizeKaleidoswapArgs('kaleidoswap_atomic_status', { atomic_id: 'h1' })).toMatchObject({ payment_hash: 'h1' });
+  });
+});

package/src/kaleidoswap/contract.ts

@@ -70,14 +70,16 @@ export const KALEIDOSWAP_TOOLS: KaleidoswapToolDef[] = [
 
   t('market',
     'kaleidoswap_get_quote',
-    'Get an executable quote for swapping a specific amount on one pair. Returns a quote id (use it with atomic_init), the expected receive amount, fees, slippage, and how long the quote is valid for. Re-quote rather than reusing a stale id.',
+    'Get an executable quote for one pair. Amounts are DISPLAY units (0.0005 = 0.0005 BTC = 50,000 sats). Give exactly one of from_amount (sell a fixed input) or to_amount (buy a fixed output). Returns rfq_id, from_asset/to_asset with amount_display and amount_raw, price and expires_at (~60s).',
     {
-      from_asset: { type: 'string', description: 'Asset to spend, e.g. "BTC" or "USDT".' },
-      to_asset:   { type: 'string', description: 'Asset to receive, e.g. "USDT" or "BTC".' },
-      amount:     { type: 'number', description: 'Amount of from_asset to swap. BTC is in satoshis; RGB assets use their asset-defined precision.' },
-      side:       { type: 'string', enum: ['buy', 'sell'], description: 'Default "sell" (you sell from_asset). Use "buy" only when from_asset is the quote currency you spend to acquire to_asset.' },
+      from_asset_id: { type: 'string', description: "Asset to sell: ticker ('BTC', 'USDT') or RGB id ('rgb:…')." },
+      to_asset_id:   { type: 'string', description: "Asset to buy: ticker ('USDT', 'BTC') or RGB id ('rgb:…')." },
+      from_layer:    { type: 'string', description: "Optional: 'BTC_LN', 'RGB_LN', 'BTC_SPARK'. Derived from the asset when omitted." },
+      to_layer:      { type: 'string', description: "Optional: 'RGB_LN', 'BTC_LN', 'BTC_SPARK'. Derived from the asset when omitted." },
+      from_amount:   { type: 'number', description: 'Amount to SELL in display units (e.g. 0.001 BTC, 10 USDT).' },
+      to_amount:     { type: 'number', description: 'Amount to BUY in display units (e.g. 10 USDT).' },
     },
-    ['from_asset', 'to_asset', 'amount']),
+    ['from_asset_id', 'to_asset_id']),
 
   t('market',
     'kaleidoswap_get_nodeinfo',
@@ -86,30 +88,36 @@ export const KALEIDOSWAP_TOOLS: KaleidoswapToolDef[] = [
   // ─── atomic (the trust-minimised swap chain — used by the recipe) ───────
   t('atomic',
     'kaleidoswap_atomic_init',
-    "Initialise an atomic swap from a quote. Requires the receiver's RGB/LN invoice so the maker can lock the outgoing leg. SPEND: confirmation-gated. Returns the maker's invoice for the user to pay and an atomic id to track.",
+    'Start an atomic swap from a fresh quote. SPEND: confirmation-gated. Pass the quote rfq_id, both asset ids and the quote legs\' amount_raw values unchanged. Returns swapstring, payment_hash and access_token (keep it for status).',
     {
-      quote_id:        { type: 'string', description: 'The quote id from kaleidoswap_get_quote.' },
-      receive_invoice: { type: 'string', description: "The user's RGB or Lightning invoice for to_asset, created on the user's own node." },
+      rfq_id:          { type: 'string', description: 'rfq_id from kaleidoswap_get_quote.' },
+      from_asset_id:   { type: 'string', description: 'from_asset.asset_id from the quote.' },
+      from_amount_raw: { type: 'integer', description: 'from_asset.amount_raw from the quote, unchanged.' },
+      to_asset_id:     { type: 'string', description: 'to_asset.asset_id from the quote.' },
+      to_amount_raw:   { type: 'integer', description: 'to_asset.amount_raw from the quote, unchanged.' },
     },
-    ['quote_id', 'receive_invoice'],
+    ['rfq_id', 'from_asset_id', 'from_amount_raw', 'to_asset_id', 'to_amount_raw'],
     /* spend */ true),
 
   t('atomic',
     'kaleidoswap_atomic_execute',
-    "Tell the maker to release the receive leg now that the user has paid the maker's invoice. SPEND: confirmation-gated (committing the swap). Returns an updated atomic status.",
+    'Confirm the swap after rln_atomic_taker whitelisted the swapstring. SPEND: confirmation-gated. taker_pubkey is the pubkey from rln_get_node_info.',
     {
-      atomic_id: { type: 'string', description: 'The atomic id from kaleidoswap_atomic_init.' },
+      swapstring:   { type: 'string', description: 'swapstring from kaleidoswap_atomic_init.' },
+      taker_pubkey: { type: 'string', description: 'Node pubkey from rln_get_node_info.' },
+      payment_hash: { type: 'string', description: 'payment_hash from kaleidoswap_atomic_init.' },
     },
-    ['atomic_id'],
+    ['swapstring', 'taker_pubkey', 'payment_hash'],
     /* spend */ true),
 
   t('atomic',
     'kaleidoswap_atomic_status',
-    'Poll the status of an atomic swap — pending_payment / paid / settling / completed / failed / expired. Use this in a loop after execute until it terminates.',
+    'Poll an atomic swap by payment_hash: Waiting → Pending → Succeeded | Expired | Failed.',
     {
-      atomic_id: { type: 'string', description: 'The atomic id from kaleidoswap_atomic_init.' },
+      payment_hash: { type: 'string', description: 'payment_hash from kaleidoswap_atomic_init.' },
+      access_token: { type: 'string', description: 'access_token from kaleidoswap_atomic_init, when the host needs it.' },
     },
-    ['atomic_id']),
+    ['payment_hash']),
 
   // ─── liquidity (buy a NEW channel pre-loaded with an asset — onboarding) ──
   t('liquidity',
@@ -157,6 +165,46 @@ export function kaleidoswapTools(
   return KALEIDOSWAP_TOOLS.filter((x) => groups.has(x.group));
 }
 
+const isBtc = (asset: unknown) => typeof asset === 'string' && /^(btc|sats?)$/i.test(asset.trim());
+
+/**
+ * Map kaleido-mcp argument names onto the pre-0.9 contract names (and back), so
+ * one call shape works on every surface and older host handlers keep working.
+ * Canonical names win; legacy names are only filled in when absent. The legacy
+ * quote `amount` is sats for BTC and display units otherwise.
+ */
+export function normalizeKaleidoswapArgs(name: string, args: Record<string, unknown>): Record<string, unknown> {
+  const a: Record<string, unknown> = { ...args };
+  const alias = (canonical: string, legacy: string) => {
+    if (a[canonical] == null && a[legacy] != null) a[canonical] = a[legacy];
+    if (a[legacy] == null && a[canonical] != null) a[legacy] = a[canonical];
+  };
+  if (name === 'kaleidoswap_get_quote') {
+    if (a.from_asset_id == null && a.from_asset != null) a.from_asset_id = a.from_asset;
+    if (a.to_asset_id == null && a.to_asset != null) a.to_asset_id = a.to_asset;
+    if (a.from_amount == null && a.to_amount == null && a.amount != null) {
+      const side = a.amount_side === 'to' || a.side === 'buy' ? 'to' : 'from';
+      const asset = side === 'to' ? a.to_asset_id : a.from_asset_id;
+      const display = isBtc(asset) ? Number(a.amount) / 1e8 : Number(a.amount);
+      a[side === 'to' ? 'to_amount' : 'from_amount'] = display;
+    }
+    a.from_asset ??= a.from_asset_id;
+    a.to_asset ??= a.to_asset_id;
+    if (a.amount == null) {
+      const toSide = a.from_amount == null && a.to_amount != null;
+      const display = Number(toSide ? a.to_amount : a.from_amount);
+      const asset = toSide ? a.to_asset_id : a.from_asset_id;
+      if (Number.isFinite(display)) a.amount = isBtc(asset) ? Math.round(display * 1e8) : display;
+      if (toSide) a.amount_side = 'to';
+    }
+  } else if (name === 'kaleidoswap_atomic_init') {
+    alias('rfq_id', 'quote_id');
+  } else if (name === 'kaleidoswap_atomic_execute' || name === 'kaleidoswap_atomic_status') {
+    alias('payment_hash', 'atomic_id');
+  }
+  return a;
+}
+
 /** A handler bound to one contract tool. Args validated by JSON schema upstream. */
 export type KaleidoswapHandler = (args: Record<string, unknown>) => Promise<unknown>;
 
@@ -199,7 +247,7 @@ export function bindKaleidoswapTools(
       description: def.description,
       parameters: def.parameters,
       requiresConfirmation: def.requiresConfirmation,
-      handler,
+      handler: (args) => handler(normalizeKaleidoswapArgs(def.name, args)),
     });
   }
   return new InProcessToolSource(opts.id ?? 'kaleidoswap', bound);

package/src/kaleidoswap/index.ts

@@ -3,6 +3,7 @@ export {
   KALEIDOSWAP_TOOLS,
   KALEIDOSWAP_SPEND_TOOLS,
   isKaleidoswapSpendTool,
+  normalizeKaleidoswapArgs,
   getKaleidoswapTool,
   kaleidoswapTools,
   bindKaleidoswapTools,

package/src/qvac/provider.test.ts

@@ -123,6 +123,23 @@ describe('createQvacProvider.runTurn', () => {
     expect(deleted).toEqual([{ kvCacheKey: 'run-1' }]);
   });
 
+  it('retries a turn without reasoning when the tool grammar rejects the inserted </think>', async () => {
+    const calls: any[] = [];
+    const fn = (params: any) => {
+      calls.push(params);
+      if (calls.length === 1) throw new Error('Unexpected empty grammar stack after accepting piece: </think> (248069)');
+      return { requestId: 'req-2', events: (async function* () {})(), final: Promise.resolve({ contentText: 'ok', toolCalls: [], raw: { fullText: 'ok' } }) };
+    };
+    const p = createQvacProvider({ completion: fn as any, cancel: noopCancel, getModelId: () => 'm1', maxThinkingTokens: 128 });
+    const out = await p.runTurn({ messages: [{ role: 'user', content: 'x' }], tools: [] });
+    expect(out.text).toBe('ok');
+    expect(calls.map((c) => c.generationParams?.reasoning_budget)).toEqual([128, 0]);
+    await expect(
+      createQvacProvider({ completion: (() => { throw new Error('boom'); }) as any, cancel: noopCancel, getModelId: () => 'm1' })
+        .runTurn({ messages: [{ role: 'user', content: 'x' }], tools: [] }),
+    ).rejects.toThrow('boom');
+  });
+
   it('keeps the reasoning budget below the output cap', async () => {
     const { fn, calls } = fakeCompletion({ contentText: 'ok', toolCalls: [], raw: { fullText: 'ok' } });
     const p = createQvacProvider({ completion: fn as any, cancel: noopCancel, getModelId: () => 'm1', defaultMaxTokens: 512, maxThinkingTokens: 512 });

package/src/qvac/provider.ts

@@ -76,11 +76,17 @@ export interface QvacTurnInput extends TurnInput {
   onStats?: (stats: QvacTurnStats) => void;
 }
 
-export function createQvacProvider(options: QvacProviderOptions): LLMProvider {
-  return {
-    name: 'qvac',
+/**
+ * llama.cpp's tool-call grammar can reject the `</think>` it inserts when a
+ * reasoning budget runs out ("Unexpected empty grammar stack after accepting
+ * piece: </think>"), which aborts the turn.
+ */
+function isReasoningGrammarError(err: unknown): boolean {
+  return /empty grammar stack/i.test(err instanceof Error ? err.message : String(err));
+}
 
-    async runTurn(input: QvacTurnInput): Promise<TurnOutput> {
+export function createQvacProvider(options: QvacProviderOptions): LLMProvider {
+  const runTurnOnce = async (input: QvacTurnInput): Promise<TurnOutput> => {
       const modelId = options.getModelId();
       if (!modelId) throw new Error('QVAC model not loaded');
 
@@ -192,6 +198,19 @@ export function createQvacProvider(options: QvacProviderOptions): LLMProvider {
         inference,
         ...(incomplete ? { incomplete: true } : {}),
       };
+  };
+
+  return {
+    name: 'qvac',
+
+    async runTurn(input: QvacTurnInput): Promise<TurnOutput> {
+      try {
+        return await runTurnOnce(input);
+      } catch (err) {
+        // Retry once without reasoning: no budget, so nothing to insert.
+        if (input.thinking === 'off' || !isReasoningGrammarError(err)) throw err;
+        return runTurnOnce({ ...input, thinking: 'off' });
+      }
     },
 
     async endSession(sessionKey: string): Promise<void> {

package/src/recipe/asset-send.ts

@@ -69,7 +69,7 @@ export const assetSendRecipe: Recipe = {
     tool: 'rln_send_asset',
     args: (ctx: RecipeContext) => {
       const contact = ctx.results.contact as { ln_address?: string } | undefined;
-      return { asset: ctx.slots.asset, amount: ctx.slots.amount, to: contact?.ln_address ?? ctx.slots.recipient };
+      return { asset_id: ctx.slots.asset, amount: ctx.slots.amount, recipient_id: contact?.ln_address ?? ctx.slots.recipient };
     },
   },
   summary: (ctx) => {

package/src/recipe/recipe.test.ts

@@ -257,7 +257,7 @@ describe('runRecipe — asset send', () => {
     const res = await runRecipe(assetSendRecipe, 'send 10 usdt to bob', { provider: approve, tools, onConfirm });
     expect(res.status).toBe('done');
     expect(onConfirm).toHaveBeenCalledOnce();
-    expect(sent[0]).toEqual({ asset: 'USDT', amount: 10, to: 'bob@x.com' });
+    expect(sent[0]).toEqual({ asset_id: 'USDT', amount: 10, recipient_id: 'bob@x.com' });
   });
 });