@bsvkey/x402-bsv-client 0.4.1 → 0.4.2

package/README.md

@@ -91,18 +91,28 @@ sequence has no gap or replay, the running totals reconcile
 (`cumSats`/`cumTokens`), spending never exceeds the funded amount, and each
 **charge** recomputes from the published formula (you can be charged less, never
 more). Single-receipt helpers: `verifyReceipt(receipt)` → `{ ok, signer }`,
-`verifyCharge(receipt)`, and `verifyMeter(receipt, { system, prompt, completion })`.
+`verifyCharge(receipt)`, and `verifyMeter(receipt, { messages, completion })` (or
+`{ system, prompt, completion }` on the raw `/v1/infer` path — see below).
 
 ### Verify the meter (the token count itself)
 
 The v2 receipt binds the exact bytes and is metered by a pinned, deterministic
-tokenizer, so you recompute the token count from what you sent and received:
+tokenizer, so you recompute the token count from what you sent and received.
+
+**On the OpenAI-compatible `/v1/chat/completions` path, pass the same `messages`
+array you sent** — that endpoint meters the *flattened* messages (system joined
+with `\n`; every other turn rendered as `User: …` / `Assistant: …`, joined with
+`\n`), so `verifyMeter` needs the messages to reproduce that transform for you:
 
 ```js
 import { verifyMeter } from '@bsvkey/x402-bsv-client/usage-receipt';
-const m = verifyMeter(receipt, { system, prompt, completion }); // { ok } / { ok:false, reason }
+const m = verifyMeter(receipt, { messages, completion }); // { ok } / { ok:false, reason }
 ```
 
+On the broker-native `/v1/infer` path (raw fields), pass `{ system, prompt, completion }`
+instead. (`messagesToPrompt(messages)` is exported if you want the flattened
+`{ system, prompt }` yourself.)
+
 **What this proves:** the broker signed these exact numbers (non-repudiable), the
 token count is the published function of the exact bytes you exchanged, the charge
 is the published function of those tokens, none were double-counted, and the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsvkey/x402-bsv-client",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Pay an x402 HTTP 402 in BSV — the missing bsv-p2pkh payment builder for x402 agents. Also verifies BSVKey inference usage receipts.",
   "type": "module",
   "main": "index.js",

package/usage-receipt.js

@@ -62,6 +62,23 @@ export function computeClaimId(obj) {
 export function meterInputText(system, prompt) {
   return (system ? String(system) + '\n\n' : '') + String(prompt || '');
 }
+// The OpenAI-compatible endpoint (/v1/chat/completions) meters the FLATTENED
+// chat messages, not the raw fields: system messages are joined with '\n', and
+// every other turn becomes "User: <content>" / "Assistant: <content>", joined
+// with '\n'. To recompute inputDigest for a chat call, pass the SAME messages
+// array you sent (verifyMeter does this for you when given { messages }). This is
+// byte-identical to the broker's src/http/openai.js messagesToPrompt.
+export function messagesToPrompt(messages) {
+  const systemParts = [], turns = [];
+  for (const m of (Array.isArray(messages) ? messages : [])) {
+    const content = typeof m.content === 'string'
+      ? m.content
+      : Array.isArray(m.content) ? m.content.map((p) => p.text || '').join('') : '';
+    if (m.role === 'system') systemParts.push(content);
+    else turns.push(`${m.role === 'assistant' ? 'Assistant' : 'User'}: ${content}`);
+  }
+  return { system: systemParts.join('\n') || undefined, prompt: turns.join('\n') };
+}
 export function estimateTokens(text) {
   if (!text) return 0;
   const byChars = Math.ceil(text.length / 4);
@@ -111,8 +128,12 @@ export function verifyCharge(receipt) {
 }
 
 // The meter: recompute token counts + byte digests from the EXACT bytes you hold.
-export function verifyMeter(receipt, { system, prompt, completion } = {}) {
+// Pass EITHER the raw { system, prompt } (broker-native /v1/infer) OR the exact
+// { messages } array you sent to /v1/chat/completions (the OpenAI shim, which meters
+// the flattened messages). If `messages` is given it takes precedence.
+export function verifyMeter(receipt, { system, prompt, completion, messages } = {}) {
   if (receipt.meter !== METER_ID) return { ok: false, reason: `unknown_meter:${receipt.meter}` };
+  if (messages !== undefined) { const f = messagesToPrompt(messages); system = f.system; prompt = f.prompt; }
   const input = meterInputText(system, prompt);
   const output = String(completion || '');
   if (sha256hex(input) !== receipt.inputDigest) return { ok: false, reason: 'inputDigest_mismatch' };