@bsvkey/inference-mcp 1.1.2 → 1.2.1

package/README.md

@@ -14,11 +14,14 @@ optional `@bsvkey/x402-bsv-client` + `@bsv/sdk` packages (installed with this on
 
 **Verifiable metering.** Each `infer` call returns a signed usage receipt, and the
 tool auto-verifies it offline (with the optional packages installed): the result
-includes `receiptVerified` (`true`, `false` + `receiptCheck`, or `null` if the
-verifier isn't installed). It recovers the broker key (pinned from
-`GET /v1/receipt-key`), and checks channel binding, a monotonic sequence (no
-replay/gap), and running totals within the funded amount. So the channel payment
-is on-chain and the meter is auditable, without trusting the broker's word. Spec:
+includes `receiptVerified` and `meterVerified` (`true`, `false` + `receiptCheck`,
+or `null` if the verifier isn't installed). It recovers the broker key (pinned
+from `GET /v1/receipt-key`); checks channel binding, a monotonic sequence (no
+replay/gap), and running totals within the funded amount; **recomputes the charge**
+from the published rate (you can never be overcharged); and **recomputes the token
+count from the exact bytes** of your system/prompt and the completion, under the
+pinned `bsvkey-meter/1` tokenizer. So the channel payment is on-chain and both the
+meter and the charge are auditable, without trusting the broker's word. Spec:
 https://inference.bsvkey.com/usage-receipts.md
 
 ## Quick start

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsvkey/inference-mcp",
-  "version": "1.1.2",
+  "version": "1.2.1",
   "description": "MCP server: buy Claude & Grok inference metered per token, settled in BSV, through the hosted inference.bsvkey.com gateway. Channels or per-call x402.",
   "mcpName": "io.github.BSVKey/inference-mcp",
   "type": "module",
@@ -9,7 +9,7 @@
   "engines": { "node": ">=18" },
   "files": ["server.js", "SKILL.md", "README.md", "LICENSE"],
   "optionalDependencies": {
-    "@bsvkey/x402-bsv-client": "^0.3.0",
+    "@bsvkey/x402-bsv-client": "^0.4.2",
     "@bsv/sdk": "^2"
   },
   "keywords": ["mcp", "model-context-protocol", "bsv", "inference", "pay-per-token", "http-402", "x402", "claude", "grok", "micropayments", "agents"],

package/server.js

@@ -63,7 +63,7 @@ async function brokerReceiptKey() {
   try { const r = await http('GET', '/receipt-key'); _brokerKey = r.ok ? (r.json.receiptPubKey || null) : null; } catch { _brokerKey = null; }
   return _brokerKey;
 }
-async function verifyUsageReceipt(receipt) {
+async function verifyUsageReceipt(receipt, bytes = {}) {
   if (!receipt) return { verified: null, reason: 'no receipt returned' };
   const V = await loadVerifier();
   if (!V) return { verified: null, reason: 'verifier not installed (npm i @bsvkey/x402-bsv-client)' };
@@ -71,6 +71,18 @@ async function verifyUsageReceipt(receipt) {
   if (!one.ok) return { verified: false, reason: one.reason };
   const pinned = await brokerReceiptKey();
   if (pinned && one.signer !== pinned) return { verified: false, reason: 'signer_not_pinned_broker_key' };
+  // The charge recomputes from the receipt's own rates (overcharge is a dispute).
+  if (typeof V.verifyCharge === 'function') {
+    const c = V.verifyCharge(receipt);
+    if (!c.ok) return { verified: false, reason: `charge:${c.reason}` };
+  }
+  // The meter: recompute token counts + byte digests from the exact bytes we hold.
+  let meterVerified = null;
+  if (typeof V.verifyMeter === 'function' && (bytes.messages !== undefined || bytes.prompt !== undefined || bytes.completion !== undefined)) {
+    const mv = V.verifyMeter(receipt, bytes);
+    if (!mv.ok) return { verified: false, reason: `meter:${mv.reason}`, meterVerified: false };
+    meterVerified = true;
+  }
   if (receipt.cumSats > receipt.fundedSats) return { verified: false, reason: 'cumSats_exceeds_funded' };
   const prev = _seen.get(receipt.channelId);
   if (prev) {
@@ -80,7 +92,7 @@ async function verifyUsageReceipt(receipt) {
     if (receipt.cumTokens !== prev.cumTokens + receipt.inputTokens + receipt.outputTokens) return { verified: false, reason: 'cumTokens_does_not_reconcile' };
   }
   _seen.set(receipt.channelId, { seq: receipt.seq, cumSats: receipt.cumSats, cumTokens: receipt.cumTokens });
-  return { verified: true, ...(prev ? {} : { note: 'baseline: signature + funded-conservation checked; seq continuity verified from here' }) };
+  return { verified: true, meterVerified, ...(prev ? {} : { note: 'baseline: signature + funded-conservation checked; seq continuity verified from here' }) };
 }
 
 export const TOOLS = [
@@ -162,14 +174,15 @@ async function callTool(name, args = {}) {
     case 'infer': {
       const k = keyParts(args.apiKey);
       if (!k) throw new Error('No channel key. Pass apiKey "channelId:channelSecret" or set BSVKEY_API_KEY. Open one via the open_channel tool.');
+      const messages = [
+        ...(args.system ? [{ role: 'system', content: args.system }] : []),
+        { role: 'user', content: String(args.prompt || '') },
+      ];
       const r = await http('POST', '/chat/completions', {
         headers: { authorization: `Bearer ${k.raw}` },
         body: {
           model: args.model || 'auto',
-          messages: [
-            ...(args.system ? [{ role: 'system', content: args.system }] : []),
-            { role: 'user', content: String(args.prompt || '') },
-          ],
+          messages,
           max_tokens: args.maxTokens || 512,
           web_search: args.webSearch === true,
         },
@@ -179,18 +192,23 @@ async function callTool(name, args = {}) {
         throw new Error(typeof msg === 'string' ? msg : JSON.stringify(msg));
       }
       const x = r.json.x_bsv || {};
-      const rc = await verifyUsageReceipt(x.usageReceipt);
+      const completion = r.json.choices?.[0]?.message?.content ?? '';
+      // Meter over the SAME messages we sent: the OpenAI shim meters the flattened
+      // messages, so the verifier must reproduce that transform (needs @bsvkey/x402-bsv-client >= 0.4.2).
+      const rc = await verifyUsageReceipt(x.usageReceipt, { messages, completion });
       return {
         model: r.json.model || args.model,
-        completion: r.json.choices?.[0]?.message?.content ?? '',
+        completion,
         charge: x.charge,
         routedTo: x.routedTo,
         balanceSatsAfter: x.balanceSatsAfter,
         truncated: x.truncated || false,
         // Offline-verified signed usage receipt (see usage-receipt spec). null =
         // not checked (verifier not installed); false w/ receiptCheck = a real
-        // mismatch, treat the meter as untrusted for this call.
+        // mismatch, treat the meter as untrusted for this call. meterVerified is
+        // true when the token count was recomputed from the exact bytes.
         receiptVerified: rc.verified,
+        meterVerified: rc.meterVerified,
         ...(rc.reason ? { receiptCheck: rc.reason } : {}),
         usageReceipt: x.usageReceipt,
       };